From dd35bc90bb89ccae85275d2de587bf1d93ad3085 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Fri, 12 Nov 2021 18:30:49 +0300 Subject: [PATCH 1/5] docker: remove compose file with missing prebuilt image No https://hub.docker.com/u/bglopez/cheat.sh --- docker-compose.prebuilt.yml | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 docker-compose.prebuilt.yml 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: From fe80c3876080f280311827bb8e98f2e144078b42 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 13 Nov 2021 01:57:08 +0300 Subject: [PATCH 2/5] docker-compose: always mount source volume --- docker-compose.debug.yml | 4 +--- docker-compose.yml | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) 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.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: From 5f0aa79396816676b14725816c2f536c04c49316 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 13 Nov 2021 02:14:42 +0300 Subject: [PATCH 3/5] docker: update Alpine image (doesn't fix ansi2html issue) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 55c5f8e..9f467fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -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 \ From 10edf376e2c50d4cb08d55584914766be5334c94 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 13 Nov 2021 02:15:47 +0300 Subject: [PATCH 4/5] docker: install GNU sed to fix ansi2html (fixes #274, #301) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9f467fb..dba6b24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ 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 ## copying WORKDIR /app COPY . /app From aa8196d08bc6edb33a5be3c9e01b1aa3e5aac967 Mon Sep 17 00:00:00 2001 From: Anatoli Babenia Date: Sat, 13 Nov 2021 19:35:59 +0300 Subject: [PATCH 5/5] docker: setuptools is needed by gevent Temporary fix until this is merged https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/27419 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dba6b24..032e1db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,8 @@ 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 sed + 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