From 44df94d900f48266d83ad88676ac2050369dc41e Mon Sep 17 00:00:00 2001 From: thomas-ganter Date: Sun, 14 Feb 2021 00:47:16 +0100 Subject: [PATCH 1/5] Update Dockerfile; debug issues with curl download --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8e83617..748add9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /work RUN \ apk update && \ apk add curl && \ - curl -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ + curl --dns-servers 1.1.1.1,8.8.8.8 -v -v -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ unzip master.zip && \ cd plainkit-master && \ rm -rf README.md .editorconfig .gitignore .htaccess composer.json From ca0f30e693907a726a4b602790be7098fa571966 Mon Sep 17 00:00:00 2001 From: thomas-ganter Date: Sun, 14 Feb 2021 16:06:48 +0100 Subject: [PATCH 2/5] Update Dockerfile -> Include GD in PHP Package; Image Scaling in kirby did not work correctly. --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 748add9..4ffe10d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,4 +14,10 @@ RUN \ FROM php:8-fpm-alpine3.13 EXPOSE 9000 +WORKDIR /site + +RUN \ + apk update && apk add freetype-dev libjpeg-turbo-dev libpng-dev && \ + docker-php-ext-configure gd --with-freetype --with-jpeg && \ + docker-php-ext-install -j$(nproc) gd COPY --from=builder /work/plainkit-master /site From a3570870145f54e06128dc724c4441ca6dde3c4e Mon Sep 17 00:00:00 2001 From: thomas-ganter Date: Sun, 14 Feb 2021 17:08:54 +0100 Subject: [PATCH 3/5] =?UTF-8?q?Update=20Dockerfile;=20Remove=20verbosity?= =?UTF-8?q?=20again=20=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4ffe10d..5f62d87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ WORKDIR /work RUN \ apk update && \ apk add curl && \ - curl --dns-servers 1.1.1.1,8.8.8.8 -v -v -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ - unzip master.zip && \ + curl -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ + unzip -qq master.zip && \ cd plainkit-master && \ rm -rf README.md .editorconfig .gitignore .htaccess composer.json @@ -17,7 +17,8 @@ EXPOSE 9000 WORKDIR /site RUN \ - apk update && apk add freetype-dev libjpeg-turbo-dev libpng-dev && \ - docker-php-ext-configure gd --with-freetype --with-jpeg && \ + apk update && \ + apk add --quiet --no-progress freetype-dev libjpeg-turbo-dev libpng-dev && \ + docker-php-ext-configure gd --with-freetype --with-jpeg && \ docker-php-ext-install -j$(nproc) gd COPY --from=builder /work/plainkit-master /site From 1ad66c1a05cea264ef9122c11b0da3f90a283cd8 Mon Sep 17 00:00:00 2001 From: thomas-ganter Date: Sun, 14 Feb 2021 17:35:18 +0100 Subject: [PATCH 4/5] =?UTF-8?q?Update=20Dockerfile=20=E2=80=94=20retry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f62d87..d0beec4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM alpine:latest as builder WORKDIR /work RUN \ - apk update && \ - apk add curl && \ - curl -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ + apk update && \ + apk add curl && \ + curl --retry 3 -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ unzip -qq master.zip && \ cd plainkit-master && \ rm -rf README.md .editorconfig .gitignore .htaccess composer.json From b966e9b80865b4f47111d6136eb2378a1b78b999 Mon Sep 17 00:00:00 2001 From: thomas-ganter Date: Sun, 14 Feb 2021 17:36:54 +0100 Subject: [PATCH 5/5] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0beec4..9e7e39d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ WORKDIR /work RUN \ apk update && \ apk add curl && \ - curl --retry 3 -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ + curl --retry 5 -L -o master.zip https://github.com/getkirby/plainkit/archive/master.zip && \ unzip -qq master.zip && \ cd plainkit-master && \ rm -rf README.md .editorconfig .gitignore .htaccess composer.json