From e8413f81831a2aa484ef58a92a4e7dde876bf566 Mon Sep 17 00:00:00 2001 From: Keegan Witt Date: Fri, 27 Sep 2024 18:10:06 -0400 Subject: [PATCH] Replace legacy style env vars --- jdk11-alpine/Dockerfile | 4 ++-- jdk11/Dockerfile | 4 ++-- jdk17-alpine/Dockerfile | 4 ++-- jdk17/Dockerfile | 4 ++-- jdk21-alpine/Dockerfile | 4 ++-- jdk21/Dockerfile | 4 ++-- jdk8/Dockerfile | 4 ++-- update.ps1 | 2 +- update.sh | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jdk11-alpine/Dockerfile b/jdk11-alpine/Dockerfile index 6cf410b..ffe6433 100644 --- a/jdk11-alpine/Dockerfile +++ b/jdk11-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-alpine CMD ["groovysh"] -ENV GROOVY_HOME /opt/groovy +ENV GROOVY_HOME=/opt/groovy RUN set -o errexit -o nounset \ && echo "Adding groovy user and group" \ @@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes WORKDIR /home/groovy -ENV GROOVY_VERSION 4.0.22 +ENV GROOVY_VERSION=4.0.22 RUN set -o errexit -o nounset \ && echo "Installing build dependencies" \ && apk add --no-cache --virtual .build-deps \ diff --git a/jdk11/Dockerfile b/jdk11/Dockerfile index 2364b66..66c4357 100644 --- a/jdk11/Dockerfile +++ b/jdk11/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:11-jdk-jammy CMD ["groovysh"] -ENV GROOVY_HOME /opt/groovy +ENV GROOVY_HOME=/opt/groovy RUN set -o errexit -o nounset \ && echo "Adding groovy user and group" \ @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.22 +ENV GROOVY_VERSION=4.0.22 RUN set -o errexit -o nounset \ && echo "Downloading Groovy" \ && wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \ diff --git a/jdk17-alpine/Dockerfile b/jdk17-alpine/Dockerfile index 678e5cb..3512787 100644 --- a/jdk17-alpine/Dockerfile +++ b/jdk17-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:17-jdk-alpine CMD ["groovysh"] -ENV GROOVY_HOME /opt/groovy +ENV GROOVY_HOME=/opt/groovy RUN set -o errexit -o nounset \ && echo "Adding groovy user and group" \ @@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes WORKDIR /home/groovy -ENV GROOVY_VERSION 4.0.22 +ENV GROOVY_VERSION=4.0.22 RUN set -o errexit -o nounset \ && echo "Installing build dependencies" \ && apk add --no-cache --virtual .build-deps \ diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile index 5d5f2ed..0bf082f 100644 --- a/jdk17/Dockerfile +++ b/jdk17/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:17-jdk-jammy CMD ["groovysh"] -ENV GROOVY_HOME /opt/groovy +ENV GROOVY_HOME=/opt/groovy RUN set -o errexit -o nounset \ && echo "Adding groovy user and group" \ @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.22 +ENV GROOVY_VERSION=4.0.22 RUN set -o errexit -o nounset \ && echo "Downloading Groovy" \ && wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \ diff --git a/jdk21-alpine/Dockerfile b/jdk21-alpine/Dockerfile index 213f011..435a6a0 100644 --- a/jdk21-alpine/Dockerfile +++ b/jdk21-alpine/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:21-jdk-alpine CMD ["groovysh"] -ENV GROOVY_HOME /opt/groovy +ENV GROOVY_HOME=/opt/groovy RUN set -o errexit -o nounset \ && echo "Adding groovy user and group" \ @@ -19,7 +19,7 @@ VOLUME /home/groovy/.groovy/grapes WORKDIR /home/groovy -ENV GROOVY_VERSION 4.0.22 +ENV GROOVY_VERSION=4.0.22 RUN set -o errexit -o nounset \ && echo "Installing build dependencies" \ && apk add --no-cache --virtual .build-deps \ diff --git a/jdk21/Dockerfile b/jdk21/Dockerfile index 4591c36..2b1cae9 100644 --- a/jdk21/Dockerfile +++ b/jdk21/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:21-jdk-jammy CMD ["groovysh"] -ENV GROOVY_HOME /opt/groovy +ENV GROOVY_HOME=/opt/groovy RUN set -o errexit -o nounset \ && echo "Adding groovy user and group" \ @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.22 +ENV GROOVY_VERSION=4.0.22 RUN set -o errexit -o nounset \ && echo "Downloading Groovy" \ && wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \ diff --git a/jdk8/Dockerfile b/jdk8/Dockerfile index add07b8..d9d7676 100644 --- a/jdk8/Dockerfile +++ b/jdk8/Dockerfile @@ -2,7 +2,7 @@ FROM eclipse-temurin:8-jdk-jammy CMD ["groovysh"] -ENV GROOVY_HOME /opt/groovy +ENV GROOVY_HOME=/opt/groovy RUN set -o errexit -o nounset \ && echo "Adding groovy user and group" \ @@ -29,7 +29,7 @@ RUN set -o errexit -o nounset \ wget \ && rm --recursive --force /var/lib/apt/lists/* -ENV GROOVY_VERSION 4.0.22 +ENV GROOVY_VERSION=4.0.22 RUN set -o errexit -o nounset \ && echo "Downloading Groovy" \ && wget --no-verbose --output-document=groovy.zip "https://archive.apache.org/dist/groovy/${GROOVY_VERSION}/distribution/apache-groovy-binary-${GROOVY_VERSION}.zip" \ diff --git a/update.ps1 b/update.ps1 index 9be503d..297f240 100644 --- a/update.ps1 +++ b/update.ps1 @@ -3,6 +3,6 @@ $groovyVersion = $(((Invoke-WebRequest "https://api.github.com/repos/apache/groo Write-Host "Updating to Groovy $groovyVersion" dir -Recurse -Filter Dockerfile | ForEach-Object { - (Get-Content -Path $_.FullName) -replace "ENV GROOVY_VERSION .+", "ENV GROOVY_VERSION ${groovyVersion}" | Set-Content $_.FullName + (Get-Content -Path $_.FullName) -replace "ENV GROOVY_VERSION=.+", "ENV GROOVY_VERSION=${groovyVersion}" | Set-Content $_.FullName } (Get-Content -Path .github/workflows/ci.yaml) -replace "expectedGroovyVersion: .+", "expectedGroovyVersion: ${groovyVersion}" | Set-Content .github/workflows/ci.yaml diff --git a/update.sh b/update.sh index 669c2c2..04b35f7 100644 --- a/update.sh +++ b/update.sh @@ -4,5 +4,5 @@ set -o errexit -o nounset -o pipefail groovyVersion=$(curl -s 'https://api.github.com/repos/apache/groovy/tags' | grep -Eo 'GROOVY_4.[0-9]{1,2}.[0-9]{1,2}' | head -n 1 | sed -e 's/GROOVY_//' -e 's/_/./g') echo "Updating to Groovy $groovyVersion" -sed --regexp-extended --in-place "s/ENV GROOVY_VERSION .+/ENV GROOVY_VERSION ${groovyVersion}/" ./*/Dockerfile +sed --regexp-extended --in-place "s/ENV GROOVY_VERSION=.+/ENV GROOVY_VERSION=${groovyVersion}/" ./*/Dockerfile sed --regexp-extended --in-place "s/expectedGroovyVersion: .+$/expectedGroovyVersion: ${groovyVersion}/" .github/workflows/ci.yaml