From 26d9a6b5d0d14f4a188eabf4108a12f84f84b919 Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Wed, 5 Jan 2022 14:12:04 +1100 Subject: [PATCH 1/3] Update skprmail version --- php/base/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/php/base/Dockerfile b/php/base/Dockerfile index 15fc0ab..e631b81 100644 --- a/php/base/Dockerfile +++ b/php/base/Dockerfile @@ -94,7 +94,8 @@ RUN if [[ "$PHP_VERSION" != "8.1" ]]; then \ rm -f /etc/php/conf.d/newrelic.ini; \ fi -RUN curl -sSL https://github.com/skpr/mail/releases/download/v0.0.6/skprmail_linux_amd64 -o /usr/local/bin/skprmail && \ +RUN export SKPRMAIL_VERSION=0.0.8 && \ + curl -sSL https://github.com/skpr/mail/releases/download/v${SKPRMAIL_VERSION}/skprmail_${SKPRMAIL_VERSION}_linux_amd64 -o /usr/local/bin/skprmail && \ chmod +rx /usr/local/bin/skprmail # Built using an updated build approach in this fork: https://github.com/skpr/docconv From ce14ae6be628f4e78783165f66d47aa082670044 Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Wed, 5 Jan 2022 14:24:53 +1100 Subject: [PATCH 2/3] Follow code style --- php/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/base/Dockerfile b/php/base/Dockerfile index e631b81..981d41f 100644 --- a/php/base/Dockerfile +++ b/php/base/Dockerfile @@ -96,7 +96,7 @@ fi RUN export SKPRMAIL_VERSION=0.0.8 && \ curl -sSL https://github.com/skpr/mail/releases/download/v${SKPRMAIL_VERSION}/skprmail_${SKPRMAIL_VERSION}_linux_amd64 -o /usr/local/bin/skprmail && \ - chmod +rx /usr/local/bin/skprmail + chmod +rx /usr/local/bin/skprmail; \ # Built using an updated build approach in this fork: https://github.com/skpr/docconv RUN curl -sSL https://s3.amazonaws.com/pnx-bins/docconv-d9ea05fbd50ab02d7a1d23af7ecb11d37c3b68be-${ALPINE_VERSION} -o /usr/local/bin/docconv && \ From 80ce4953898a54df575daca6bbe5097c256c2761 Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Wed, 5 Jan 2022 14:34:44 +1100 Subject: [PATCH 3/3] Simplify --- php/base/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/php/base/Dockerfile b/php/base/Dockerfile index 981d41f..916dd96 100644 --- a/php/base/Dockerfile +++ b/php/base/Dockerfile @@ -94,9 +94,8 @@ RUN if [[ "$PHP_VERSION" != "8.1" ]]; then \ rm -f /etc/php/conf.d/newrelic.ini; \ fi -RUN export SKPRMAIL_VERSION=0.0.8 && \ - curl -sSL https://github.com/skpr/mail/releases/download/v${SKPRMAIL_VERSION}/skprmail_${SKPRMAIL_VERSION}_linux_amd64 -o /usr/local/bin/skprmail && \ - chmod +rx /usr/local/bin/skprmail; \ +RUN curl -sSL https://github.com/skpr/mail/releases/download/v0.0.8/skprmail_0.0.8_linux_amd64 -o /usr/local/bin/skprmail && \ + chmod +rx /usr/local/bin/skprmail # Built using an updated build approach in this fork: https://github.com/skpr/docconv RUN curl -sSL https://s3.amazonaws.com/pnx-bins/docconv-d9ea05fbd50ab02d7a1d23af7ecb11d37c3b68be-${ALPINE_VERSION} -o /usr/local/bin/docconv && \