From f822fa7e15d5dbaebcbba94f76cc93c988dce9cd Mon Sep 17 00:00:00 2001 From: Sam ONeill Date: Mon, 1 May 2023 20:31:40 +1200 Subject: [PATCH 1/3] Adds script to restore production versions --- development/restore_production_files.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 development/restore_production_files.sh diff --git a/development/restore_production_files.sh b/development/restore_production_files.sh new file mode 100644 index 0000000..85f33e9 --- /dev/null +++ b/development/restore_production_files.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +git restore docker-compose.yml pathfinder.Dockerfile static/php/php.ini static/pathfinder/environment.ini \ No newline at end of file From fa6673e7399a23fd27728090f3d4a141a19d24ec Mon Sep 17 00:00:00 2001 From: Sam ONeill Date: Mon, 1 May 2023 20:32:44 +1200 Subject: [PATCH 2/3] Adds workaround for expired DST cert --- pathfinder.Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pathfinder.Dockerfile b/pathfinder.Dockerfile index 51c3281..e234f47 100644 --- a/pathfinder.Dockerfile +++ b/pathfinder.Dockerfile @@ -16,7 +16,12 @@ RUN composer install FROM trafex/alpine-nginx-php7:ba1dd422 -RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo php7-event shadow gettext bash apache2-utils logrotate +RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql \ + php7-fileinfo php7-event shadow gettext bash apache2-utils logrotate + +# fix expired DST Cert +RUN sed -i '/^mozilla\/DST_Root_CA_X3.crt$/ s/^/!/' /etc/ca-certificates.conf \ + && update-ca-certificates # symlink nginx logs to stdout/stderr for supervisord RUN ln -sf /dev/stdout /var/log/nginx/access.log \ From 22a025b7d068c758b6ea435bc73d0ab99fa75487 Mon Sep 17 00:00:00 2001 From: Sam ONeill Date: Mon, 1 May 2023 21:05:24 +1200 Subject: [PATCH 3/3] adds ca-certificates package --- pathfinder.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pathfinder.Dockerfile b/pathfinder.Dockerfile index e234f47..da21105 100644 --- a/pathfinder.Dockerfile +++ b/pathfinder.Dockerfile @@ -17,7 +17,7 @@ RUN composer install FROM trafex/alpine-nginx-php7:ba1dd422 RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql \ - php7-fileinfo php7-event shadow gettext bash apache2-utils logrotate + php7-fileinfo php7-event shadow gettext bash apache2-utils logrotate ca-certificates # fix expired DST Cert RUN sed -i '/^mozilla\/DST_Root_CA_X3.crt$/ s/^/!/' /etc/ca-certificates.conf \