diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b89d9c2a..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 }} @@ -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 @@ -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 }} diff --git a/abuild/Dockerfile b/abuild/Dockerfile index d1b72326..2554f916 100644 --- a/abuild/Dockerfile +++ b/abuild/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.14 +FROM alpine:3.15 RUN --mount=type=cache,target=/var/cache/apk \ diff --git a/base/Dockerfile b/base/Dockerfile index fda381cf..d9958771 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:experimental -FROM alpine:3.14 +FROM alpine:3.15 COPY build/download.sh /usr/local/bin diff --git a/dlq/Dockerfile b/dlq/Dockerfile index cc7a685a..d15cf6fb 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.15 as build ARG REPO=https://github.com/jhu-idc/derivative-ms ARG COMMIT=a4a9d0d61506057be1e3b8bc040a808b79d99592 diff --git a/drupal-dev/Dockerfile b/drupal-dev/Dockerfile index 94de41fe..31dcbddb 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 php7-pear php7-dev gcc musl-dev make \ - && pecl install xdebug \ +USER root +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 67519a1d..8710be18 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -8,40 +8,40 @@ RUN --mount=type=cache,target=/var/cache/apk \ 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 \ + 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.15-r3 --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/v3.13/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 / diff --git a/solr/Dockerfile b/solr/Dockerfile index a6fcaf58..acd96aa7 100644 --- a/solr/Dockerfile +++ b/solr/Dockerfile @@ -3,11 +3,11 @@ 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" && \ - 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 \