Skip to content

Commit a18e6d8

Browse files
authored
Merge pull request chubin#316 from chubin/redocker
Fixes for Docker + `docker-compose` workflow
2 parents abde4c2 + aa8196d commit a18e6d8

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM alpine:3.12
1+
FROM alpine:3.14
22
# fetching cheat sheets
33
## installing dependencies
44
RUN apk add --update --no-cache git py3-six py3-pygments py3-yaml py3-gevent \
5-
libstdc++ py3-colorama py3-requests py3-icu py3-redis
5+
libstdc++ py3-colorama py3-requests py3-icu py3-redis sed \
6+
py3-setuptools # https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/27419
67
## copying
78
WORKDIR /app
89
COPY . /app

docker-compose.debug.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ services:
1313
environment:
1414
FLASK_ENV: development
1515
#FLASK_RUN_RELOAD: False
16-
FLASK_APP: "bin/srv.py"
16+
FLASK_APP: "bin/app.py"
1717
FLASK_RUN_HOST: 0.0.0.0
1818
FLASK_RUN_PORT: 8002
1919
entrypoint: ["/usr/bin/flask", "run"]
20-
volumes:
21-
- .:/app:Z

docker-compose.prebuilt.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ services:
1010
- CHEATSH_CACHE_REDIS_HOST=redis
1111
ports:
1212
- "8002:8002"
13+
volumes:
14+
- .:/app:Z
1315
redis:
1416
image: redis:4-alpine
1517
volumes:

0 commit comments

Comments
 (0)