From 085b0117193a3a7e77dfe9216b5e99e94d7c950e Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 11:01:22 -0700 Subject: [PATCH 01/14] update base images to alpine:3.16 --- abuild/Dockerfile | 2 +- base/Dockerfile | 2 +- dlq/Dockerfile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abuild/Dockerfile b/abuild/Dockerfile index d1b72326..b7cd5e0a 100644 --- a/abuild/Dockerfile +++ b/abuild/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.14 +FROM alpine:3.17 RUN --mount=type=cache,target=/var/cache/apk \ diff --git a/base/Dockerfile b/base/Dockerfile index fda381cf..2853621d 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.14 +FROM alpine:3.17 COPY build/download.sh /usr/local/bin diff --git a/dlq/Dockerfile b/dlq/Dockerfile index cc7a685a..c9f39327 100644 --- a/dlq/Dockerfile +++ b/dlq/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM golang:1.17-alpine3.15 as build +FROM golang:1.19.3-alpine3.17 as build ARG REPO=https://github.com/jhu-idc/derivative-ms ARG COMMIT=a4a9d0d61506057be1e3b8bc040a808b79d99592 @@ -13,7 +13,7 @@ RUN apk add git && \ RUN go get -d -v ./... && \ go install -v ./... -FROM alpine:3.15 +FROM alpine:3.17 WORKDIR /app From c4eba3c2d242f961a83ff58a063d1346262a07df Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 11:01:39 -0700 Subject: [PATCH 02/14] update to php81 --- nginx/Dockerfile | 62 ++++++++++++++++++++++++------------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 67519a1d..b1cf7e1e 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -7,41 +7,41 @@ RUN --mount=type=cache,target=/var/cache/apk \ composer \ nginx \ gnu-libiconv \ - php7 \ - php7-ctype \ - php7-curl \ - php7-dom \ - php7-fileinfo \ - php7-fpm \ - php7-gd \ - php7-iconv \ - php7-intl \ - php7-json \ - php7-ldap \ - php7-mbstring \ - php7-mysqli \ - php7-opcache \ - php7-openssl \ - php7-pdo \ - php7-pdo_mysql \ - php7-pdo_pgsql \ - php7-pdo_sqlite \ - php7-phar \ - php7-session \ - php7-simplexml \ - php7-sqlite3 \ - php7-tokenizer \ - php7-xml \ - php7-xmlwriter \ - php7-xmlreader \ - php7-xsl \ - php7-yaml \ - php7-zip \ + php81 \ + php81-ctype \ + php81-curl \ + php81-dom \ + php81-fileinfo \ + php81-fpm \ + php81-gd \ + php81-iconv \ + php81-intl \ + php81-json \ + php81-ldap \ + php81-mbstring \ + php81-mysqli \ + php81-opcache \ + php81-openssl \ + php81-pdo \ + php81-pdo_mysql \ + php81-pdo_pgsql \ + php81-pdo_sqlite \ + php81-phar \ + php81-session \ + php81-simplexml \ + php81-sqlite3 \ + php81-tokenizer \ + php81-xml \ + php81-xmlwriter \ + php81-xmlreader \ + php81-xsl \ + php81-pecl-yaml \ + php81-zip \ && \ composer self-update --2 && \ cleanup.sh -RUN apk add gnu-libiconv=1.15-r3 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/community/ --allow-untrusted +RUN apk add gnu-libiconv=1.17-r0 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.16/community/ --allow-untrusted ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so COPY rootfs / From 24b0977b54d9a9e8c181a38f8989303db40b026c Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 11:06:00 -0700 Subject: [PATCH 03/14] update libiconv --- nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index b1cf7e1e..6a0323e9 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/cache/apk \ composer self-update --2 && \ cleanup.sh -RUN apk add gnu-libiconv=1.17-r0 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.16/community/ --allow-untrusted +RUN apk add gnu-libiconv=1.17-r0 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.17/community/ --allow-untrusted ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so COPY rootfs / From c24afaea38c8493024cb01f9cb120840ef6af2ce Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 11:12:44 -0700 Subject: [PATCH 04/14] change to alpine 3.16 for proper golang version alignment --- abuild/Dockerfile | 2 +- base/Dockerfile | 2 +- dlq/Dockerfile | 4 ++-- nginx/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/abuild/Dockerfile b/abuild/Dockerfile index b7cd5e0a..92527462 100644 --- a/abuild/Dockerfile +++ b/abuild/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.17 +FROM alpine:3.16 RUN --mount=type=cache,target=/var/cache/apk \ diff --git a/base/Dockerfile b/base/Dockerfile index 2853621d..4a1aa943 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.17 +FROM alpine:3.16 COPY build/download.sh /usr/local/bin diff --git a/dlq/Dockerfile b/dlq/Dockerfile index c9f39327..9178eafe 100644 --- a/dlq/Dockerfile +++ b/dlq/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM golang:1.19.3-alpine3.17 as build +FROM golang:1.19.3-alpine3.16 as build ARG REPO=https://github.com/jhu-idc/derivative-ms ARG COMMIT=a4a9d0d61506057be1e3b8bc040a808b79d99592 @@ -13,7 +13,7 @@ RUN apk add git && \ RUN go get -d -v ./... && \ go install -v ./... -FROM alpine:3.17 +FROM alpine:3.16 WORKDIR /app diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 6a0323e9..d2a23583 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -41,7 +41,7 @@ RUN --mount=type=cache,target=/var/cache/apk \ composer self-update --2 && \ cleanup.sh -RUN apk add gnu-libiconv=1.17-r0 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.17/community/ --allow-untrusted +RUN apk add gnu-libiconv=1.16-r0 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.16/community/ --allow-untrusted ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so COPY rootfs / From 2bdd87b35e3eb642b5326f35414c53ba9f2537fa Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 11:21:29 -0700 Subject: [PATCH 05/14] add gradle deprecation warnings --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b89d9c2a..d8d7239e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,7 +88,7 @@ jobs: run: | echo '{"experimental": "enabled"}' > ~/.docker/config.json - name: Build & Push Image - run: ./gradlew --console plain -PregistryUrl=${{ secrets.REGISTRY_URL }} -PregistryUsername=${{ secrets.REGISTRY_USER }} -PregistryPassword=${{ secrets.REGISTRY_PASS }} -Prepository=${{ secrets.REPOSITORY }} ${{ matrix.image-name }}:push + run: ./gradlew --warning-mode all --console plain -PregistryUrl=${{ secrets.REGISTRY_URL }} -PregistryUsername=${{ secrets.REGISTRY_USER }} -PregistryPassword=${{ secrets.REGISTRY_PASS }} -Prepository=${{ secrets.REPOSITORY }} ${{ matrix.image-name }}:push - name: Label Image run: | if [ "${{github.event_name}}" == "pull_request" ] ; then From 5508c951d71452a9731fcf503c63886cc1ec22a3 Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 11:26:32 -0700 Subject: [PATCH 06/14] update github action for checkout@v3 --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8d7239e..c1317c7c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ jobs: buildkit-commit: ${{ steps.establish-buildkit-head.outputs.buildkit-commit }} steps: - name: Checkout idc-isle-dc - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: jhu-idc/idc-isle-dc path: idc-isle-dc @@ -28,7 +28,7 @@ jobs: run: echo "::set-output name=isledc-commit::$(git log -1 --format='%H')" - run: echo "Using idc-isle-dc ref ${{ steps.establish-isledc-head.outputs.isledc-commit }} for tests" - name: Checkout idc-isle-buildkit - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: # Required for generating the Docker image tag fetch-depth: 0 @@ -75,7 +75,7 @@ jobs: - solr steps: - name: Checkout idc-isle-buildkit - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: fetch-depth: 0 ref: ${{ needs.setup.outputs.buildkit-commit }} @@ -123,7 +123,7 @@ jobs: working-directory: isle-dc steps: - name: Checkout idc-isle-dc - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: jhu-idc/idc-isle-dc ref: ${{ needs.setup.outputs.isledc-commit }} @@ -170,7 +170,7 @@ jobs: matrix: ${{ steps.excludes-matrix.outputs.matrix }} steps: - name: Checkout idc-isle-dc - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: jhu-idc/idc-isle-dc ref: ${{ needs.setup.outputs.isledc-commit }} @@ -197,7 +197,7 @@ jobs: fail-fast: false steps: - name: Checkout idc-isle-dc - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: repository: jhu-idc/idc-isle-dc ref: ${{ needs.setup.outputs.isle-dccommit }} From 538c61b08e4efcef203bb952bed5673f505193ab Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 11:29:00 -0700 Subject: [PATCH 07/14] update solr to new version 8.11.2 (removed deprecated 8.11.1) --- solr/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/Dockerfile b/solr/Dockerfile index a6fcaf58..6a0851b5 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -3,7 +3,7 @@ FROM local/java:latest RUN --mount=id=downloads,type=cache,target=/opt/downloads \ DOWNLOAD_CACHE_DIRECTORY="/opt/downloads" && \ - SOLR_VERSION="8.11.1" && \ + SOLR_VERSION="8.11.2" && \ SOLR_FILE="solr-${SOLR_VERSION}.tgz" && \ SOLR_URL="https://dlcdn.apache.org/lucene/solr/${SOLR_VERSION}/${SOLR_FILE}" && \ SOLR_FILE_SHA256="9ec540cbd8e45f3d15a6b615a22939f5e6242ca81099951a47d3c082c79866a9" && \ From 75e194c8f8b81f91ba171b29c0feaed16ef6fa7d Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 12:30:08 -0700 Subject: [PATCH 08/14] update solr to new version 8.11.2 (removed deprecated 8.11.1) --- solr/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solr/Dockerfile b/solr/Dockerfile index 6a0851b5..acd96aa7 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -6,8 +6,8 @@ RUN --mount=id=downloads,type=cache,target=/opt/downloads \ SOLR_VERSION="8.11.2" && \ SOLR_FILE="solr-${SOLR_VERSION}.tgz" && \ SOLR_URL="https://dlcdn.apache.org/lucene/solr/${SOLR_VERSION}/${SOLR_FILE}" && \ - SOLR_FILE_SHA256="9ec540cbd8e45f3d15a6b615a22939f5e6242ca81099951a47d3c082c79866a9" && \ - SOLR_SIG_SHA256="6a1eca93d0d0a80647cb60063f5e46347350b03a0f75b6a662d1b0a4746dabba" && \ + SOLR_FILE_SHA256="54d6ebd392942f0798a60d50a910e26794b2c344ee97c2d9b50e678a7066d3a6" && \ + SOLR_SIG_SHA256="1dc449783b89ae9287d1e31db0514d62aeb6edce199d541a29303e8d5c98d31e" && \ download.sh --url "${SOLR_URL}" --sha256 "${SOLR_FILE_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \ download.sh --url "${SOLR_URL}.asc" --sha256 "${SOLR_SIG_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \ install-apache-service.sh \ From 82d68e648d6e242e2594c9e7f49fbe73b05fa9d5 Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 14:45:19 -0700 Subject: [PATCH 09/14] php81 updates for drupal-dev, update drush to 0.7.4 --- drupal-dev/Dockerfile | 2 +- drupal/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drupal-dev/Dockerfile b/drupal-dev/Dockerfile index 94de41fe..96d18dc8 100644 --- a/drupal-dev/Dockerfile +++ b/drupal-dev/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:experimental FROM local/drupal:latest -RUN apk --no-cache add pcre-dev php7-pear php7-dev gcc musl-dev make \ +RUN apk --no-cache add pcre-dev php81-pear php81-dev gcc musl-dev make \ && pecl install xdebug \ && apk del pcre-dev diff --git a/drupal/Dockerfile b/drupal/Dockerfile index cdc2b153..ff21352e 100644 --- a/drupal/Dockerfile +++ b/drupal/Dockerfile @@ -14,10 +14,10 @@ RUN --mount=type=cache,target=/etc/cache/apk \ RUN --mount=id=downloads,type=cache,target=/opt/downloads \ DOWNLOAD_CACHE_DIRECTORY="/opt/downloads" && \ - DRUSH_VERSION="0.6.0" && \ + DRUSH_VERSION="0.7.4" && \ DRUSH_FILE="drush.phar" && \ DRUSH_URL="https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_VERSION}/${DRUSH_FILE}" && \ - DRUSH_SHA256="c3f32a800a2f18470b0010cd71c49e49ef5c087f8131eecfe9b686dc1f3f3d4e" && \ + DRUSH_SHA256="79081b7e6ed69020d8404df74c3e43dd3d21daef82e30756f9692a7b5e63cbb7" && \ download.sh --url "${DRUSH_URL}" --sha256 "${DRUSH_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \ cp "${DOWNLOAD_CACHE_DIRECTORY}/${DRUSH_FILE}" /usr/bin/drush && \ chmod a+x /usr/bin/drush && \ From bebe1dba270b26aefa2242d4e2bfd09066a81ca2 Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 15:06:32 -0700 Subject: [PATCH 10/14] php81 pecl for drupal-dev --- drupal-dev/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drupal-dev/Dockerfile b/drupal-dev/Dockerfile index 96d18dc8..f37a8c9f 100644 --- a/drupal-dev/Dockerfile +++ b/drupal-dev/Dockerfile @@ -1,9 +1,8 @@ # syntax=docker/dockerfile:experimental FROM local/drupal:latest - -RUN apk --no-cache add pcre-dev php81-pear php81-dev gcc musl-dev make \ - && pecl install xdebug \ +USER root +RUN apk --no-cache add pcre-dev php81-pear php81-dev gcc musl-dev make php81-pecl-xdebug \ && apk del pcre-dev - +USER builder COPY rootfs / From 2420d39748fc05a4febedafc60460921caaeb25b Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 16:40:16 -0700 Subject: [PATCH 11/14] revert back to php7 --- abuild/Dockerfile | 2 +- base/Dockerfile | 2 +- dlq/Dockerfile | 4 +-- drupal-dev/Dockerfile | 2 +- nginx/Dockerfile | 62 +++++++++++++++++++++---------------------- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/abuild/Dockerfile b/abuild/Dockerfile index 92527462..2554f916 100644 --- a/abuild/Dockerfile +++ b/abuild/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.16 +FROM alpine:3.15 RUN --mount=type=cache,target=/var/cache/apk \ diff --git a/base/Dockerfile b/base/Dockerfile index 4a1aa943..d9958771 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.16 +FROM alpine:3.15 COPY build/download.sh /usr/local/bin diff --git a/dlq/Dockerfile b/dlq/Dockerfile index 9178eafe..d15cf6fb 100644 --- a/dlq/Dockerfile +++ b/dlq/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM golang:1.19.3-alpine3.16 as build +FROM golang:1.19.3-alpine3.15 as build ARG REPO=https://github.com/jhu-idc/derivative-ms ARG COMMIT=a4a9d0d61506057be1e3b8bc040a808b79d99592 @@ -13,7 +13,7 @@ RUN apk add git && \ RUN go get -d -v ./... && \ go install -v ./... -FROM alpine:3.16 +FROM alpine:3.15 WORKDIR /app diff --git a/drupal-dev/Dockerfile b/drupal-dev/Dockerfile index f37a8c9f..31dcbddb 100644 --- a/drupal-dev/Dockerfile +++ b/drupal-dev/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:experimental FROM local/drupal:latest USER root -RUN apk --no-cache add pcre-dev php81-pear php81-dev gcc musl-dev make php81-pecl-xdebug \ +RUN apk --no-cache add pcre-dev php-pear php7-dev gcc musl-dev make php7-pecl-xdebug \ && apk del pcre-dev USER builder COPY rootfs / diff --git a/nginx/Dockerfile b/nginx/Dockerfile index d2a23583..7f9820bd 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -7,41 +7,41 @@ RUN --mount=type=cache,target=/var/cache/apk \ composer \ nginx \ gnu-libiconv \ - php81 \ - php81-ctype \ - php81-curl \ - php81-dom \ - php81-fileinfo \ - php81-fpm \ - php81-gd \ - php81-iconv \ - php81-intl \ - php81-json \ - php81-ldap \ - php81-mbstring \ - php81-mysqli \ - php81-opcache \ - php81-openssl \ - php81-pdo \ - php81-pdo_mysql \ - php81-pdo_pgsql \ - php81-pdo_sqlite \ - php81-phar \ - php81-session \ - php81-simplexml \ - php81-sqlite3 \ - php81-tokenizer \ - php81-xml \ - php81-xmlwriter \ - php81-xmlreader \ - php81-xsl \ - php81-pecl-yaml \ - php81-zip \ + php \ + php-ctype \ + php-curl \ + php-dom \ + php-fileinfo \ + php-fpm \ + php-gd \ + php-iconv \ + php-intl \ + php-json \ + php-ldap \ + php-mbstring \ + php-mysqli \ + php-opcache \ + php-openssl \ + php-pdo \ + php-pdo_mysql \ + php-pdo_pgsql \ + php-pdo_sqlite \ + php-phar \ + php-session \ + php-simplexml \ + php-sqlite3 \ + php-tokenizer \ + php-xml \ + php-xmlwriter \ + php-xmlreader \ + php-xsl \ + php7-pecl-yaml \ + php-zip \ && \ composer self-update --2 && \ cleanup.sh -RUN apk add gnu-libiconv=1.16-r0 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.16/community/ --allow-untrusted +RUN apk add gnu-libiconv=1.16-r0 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.15/community/ --allow-untrusted ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so COPY rootfs / From dbca8314c47ae4aed8588cdc66f73728816d8236 Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 16:46:48 -0700 Subject: [PATCH 12/14] revert back to php7 --- nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 7f9820bd..8710be18 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -7,7 +7,7 @@ RUN --mount=type=cache,target=/var/cache/apk \ composer \ nginx \ gnu-libiconv \ - php \ + php7 \ php-ctype \ php-curl \ php-dom \ From 952f6b2c1100527839acad01d5a282147d7383bd Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 17:05:08 -0700 Subject: [PATCH 13/14] revert drush.phar --- drupal/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drupal/Dockerfile b/drupal/Dockerfile index ff21352e..53d984dd 100644 --- a/drupal/Dockerfile +++ b/drupal/Dockerfile @@ -14,10 +14,10 @@ RUN --mount=type=cache,target=/etc/cache/apk \ RUN --mount=id=downloads,type=cache,target=/opt/downloads \ DOWNLOAD_CACHE_DIRECTORY="/opt/downloads" && \ - DRUSH_VERSION="0.7.4" && \ - DRUSH_FILE="drush.phar" && \ + DRUSH_VERSION="0.6.0" && \ + DRUSH_FILE="drush.har" && \ DRUSH_URL="https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_VERSION}/${DRUSH_FILE}" && \ - DRUSH_SHA256="79081b7e6ed69020d8404df74c3e43dd3d21daef82e30756f9692a7b5e63cbb7" && \ + DRUSH_SHA256="c3f32a800a2f18470b0010cd71c49e49ef5c087f8131eecfe9b686dc1f3f3d4e" && \ download.sh --url "${DRUSH_URL}" --sha256 "${DRUSH_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \ cp "${DOWNLOAD_CACHE_DIRECTORY}/${DRUSH_FILE}" /usr/bin/drush && \ chmod a+x /usr/bin/drush && \ From aed5d4a1896d52ee3c51158bddfece97eff05cc2 Mon Sep 17 00:00:00 2001 From: Tim Martin Date: Mon, 28 Nov 2022 18:04:51 -0700 Subject: [PATCH 14/14] revert drush.phar --- drupal/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drupal/Dockerfile b/drupal/Dockerfile index 53d984dd..cdc2b153 100644 --- a/drupal/Dockerfile +++ b/drupal/Dockerfile @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/etc/cache/apk \ RUN --mount=id=downloads,type=cache,target=/opt/downloads \ DOWNLOAD_CACHE_DIRECTORY="/opt/downloads" && \ DRUSH_VERSION="0.6.0" && \ - DRUSH_FILE="drush.har" && \ + DRUSH_FILE="drush.phar" && \ DRUSH_URL="https://github.com/drush-ops/drush-launcher/releases/download/${DRUSH_VERSION}/${DRUSH_FILE}" && \ DRUSH_SHA256="c3f32a800a2f18470b0010cd71c49e49ef5c087f8131eecfe9b686dc1f3f3d4e" && \ download.sh --url "${DRUSH_URL}" --sha256 "${DRUSH_SHA256}" "${DOWNLOAD_CACHE_DIRECTORY}" && \