aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/docker
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2022-10-15 23:38:49 +0200
committerEgor Tensin <Egor.Tensin@gmail.com>2022-10-15 23:39:22 +0200
commit607f99684540d12499d2cb4b6312a8ff75ebd3b4 (patch)
tree2c94388a0528cb526af67cd70cdd46661ce02616 /docker
parentworkflows/ci: use pip install -e . (diff)
downloadcgitize-607f99684540d12499d2cb4b6312a8ff75ebd3b4.tar.gz
cgitize-607f99684540d12499d2cb4b6312a8ff75ebd3b4.zip
frontend: fix Docker builds
This is what I get for abandoning my stuff for a while. The base image nginx:1-alpine switched Alpine versions, and it doesn't have some packages anymore. Oh well.
Diffstat (limited to 'docker')
-rw-r--r--docker/frontend/Dockerfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile
index 48e16ac..528ace2 100644
--- a/docker/frontend/Dockerfile
+++ b/docker/frontend/Dockerfile
@@ -3,11 +3,12 @@ FROM nginx:1-alpine AS base
FROM base AS builder
# Install cmark-gfm:
-ARG CMARK_GFM_VERSION=0.29.0.gfm.3
+ARG CMARK_GFM_VERSION=0.29.0.gfm.6
ADD ["https://github.com/github/cmark-gfm/archive/refs/tags/$CMARK_GFM_VERSION.zip", "/"]
-RUN apk add --no-cache cmake g++ make python2 && \
- unzip -- "$CMARK_GFM_VERSION.zip" && \
+RUN apk add --no-cache cmake g++ make python3 && \
+ ln -sf /usr/bin/python3 /usr/bin/python
+RUN unzip -- "$CMARK_GFM_VERSION.zip" && \
cd -- "cmark-gfm-$CMARK_GFM_VERSION" && \
make INSTALL_PREFIX=/cmark-gfm && \
make test && \