Merge pull request #316 from chubin/redocker

Fixes for Docker + `docker-compose` workflow

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

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

docker-compose.prebuilt.yml

@@ -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:

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: