diff --git a/Dockerfile b/Dockerfile index 55c5f8e..032e1db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ -FROM alpine:3.12 +FROM alpine:3.14 # fetching cheat sheets ## installing dependencies RUN apk add --update --no-cache git py3-six py3-pygments py3-yaml py3-gevent \ - libstdc++ py3-colorama py3-requests py3-icu py3-redis + libstdc++ py3-colorama py3-requests py3-icu py3-redis sed \ + py3-setuptools # https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/27419 ## copying WORKDIR /app COPY . /app diff --git a/docker-compose.debug.yml b/docker-compose.debug.yml index a4107e3..1a4f81f 100644 --- a/docker-compose.debug.yml +++ b/docker-compose.debug.yml @@ -13,9 +13,7 @@ services: environment: FLASK_ENV: development #FLASK_RUN_RELOAD: False - FLASK_APP: "bin/srv.py" + FLASK_APP: "bin/app.py" FLASK_RUN_HOST: 0.0.0.0 FLASK_RUN_PORT: 8002 entrypoint: ["/usr/bin/flask", "run"] - volumes: - - .:/app:Z diff --git a/docker-compose.prebuilt.yml b/docker-compose.prebuilt.yml deleted file mode 100644 index 898d9f2..0000000 --- a/docker-compose.prebuilt.yml +++ /dev/null @@ -1,14 +0,0 @@ -version: '2' -services: - app: - image: bglopez/cheat.sh - depends_on: - - redis - ports: - - "8002:8002" - redis: - image: redis:4-alpine - volumes: - - redis_data:/data -volumes: - redis_data: diff --git a/docker-compose.yml b/docker-compose.yml index 9e5f58f..bba1dda 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,8 @@ services: - CHEATSH_CACHE_REDIS_HOST=redis ports: - "8002:8002" + volumes: + - .:/app:Z redis: image: redis:4-alpine volumes: