Merge pull request #199 from keeganwitt/alpine

keeganwitt · web-flow · commit 94b53864a8ae · 2021-10-30T18:26:30.000-04:00
Add Alpine images
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,21 +11,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        version: [8, 11, 17]
+        version: [8-jdk, 11-jdk, 11-jdk-alpine, 17-jdk, 17-jdk-alpine]
     steps:
       - name: checkout
         uses: actions/checkout@v2
       - name: build
         env:
           version: ${{ matrix.version }}
         run: |
-          cd "jdk${version}"
-          docker pull "eclipse-temurin:${version}-jdk"
-          docker build --tag "gradle:jdk${version}" .
+          cd "jdk${version/-jdk/}"
+          docker pull "eclipse-temurin:${version}"
+          docker build --tag "gradle:${version}" .
       - name: test
         env:
           version: ${{ matrix.version }}
           expectedGradleVersion: 7.2
         run: |
           cd test
-          ./run.sh "gradle:jdk${version}" "${expectedGradleVersion}"
+          ./run.sh "gradle:${version}" "${expectedGradleVersion}"
diff --git a/README.md b/README.md
@@ -4,7 +4,9 @@
 
 * [jdk8](https://github.com/keeganwitt/docker-gradle/blob/master/jdk8/Dockerfile)
 * [jdk11](https://github.com/keeganwitt/docker-gradle/blob/master/jdk11/Dockerfile)
-* [jdk17, jdk, latest](https://github.com/keeganwitt/docker-gradle/blob/master/jdk17/Dockerfile)
+* [jdk11-alpine](https://github.com/keeganwitt/docker-gradle/blob/master/jdk11-alpine/Dockerfile)
+* [jdk17, latest](https://github.com/keeganwitt/docker-gradle/blob/master/jdk17/Dockerfile)
+* [jdk17-alpine, alpine](https://github.com/keeganwitt/docker-gradle/blob/master/jdk17-alpine/Dockerfile)
 
 ## What is Gradle?
 
diff --git a/jdk11-alpine/Dockerfile b/jdk11-alpine/Dockerfile
@@ -0,0 +1,51 @@
+FROM eclipse-temurin:11-jdk-alpine
+
+CMD ["gradle"]
+
+ENV GRADLE_HOME /opt/gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && addgroup -S -g 1000 gradle \
+    && adduser -D -S -G gradle -u 1000 -s /bin/ash gradle \
+    && mkdir /home/gradle/.gradle \
+    && chown -R gradle:gradle /home/gradle \
+    \
+    && echo "Symlinking root Gradle cache to gradle Gradle cache" \
+    && ln -s /home/gradle/.gradle /root/.gradle
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Installing VCSes" \
+    && apk add --no-cache \
+      git \
+      git-lfs \
+      mercurial \
+      subversion \
+    \
+    && echo "Testing VCSes" \
+    && which git \
+    && which git-lfs \
+    && which hg \
+    && which svn
+
+ENV GRADLE_VERSION 7.2
+ARG GRADLE_DOWNLOAD_SHA256=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+RUN set -o errexit -o nounset \
+    && echo "Downloading Gradle" \
+    && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
+    \
+    && echo "Checking download hash" \
+    && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum -c - \
+    \
+    && echo "Installing Gradle" \
+    && unzip gradle.zip \
+    && rm gradle.zip \
+    && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
+    \
+    && echo "Testing Gradle installation" \
+    && gradle --version
diff --git a/jdk11/Dockerfile b/jdk11/Dockerfile
@@ -12,13 +12,14 @@ RUN set -o errexit -o nounset \
     && chown --recursive gradle:gradle /home/gradle \
     \
     && echo "Symlinking root Gradle cache to gradle Gradle cache" \
-    && ln -s /home/gradle/.gradle /root/.gradle
+    && ln --symbolic /home/gradle/.gradle /root/.gradle
 
 VOLUME /home/gradle/.gradle
 
 WORKDIR /home/gradle
 
-RUN apt-get update \
+RUN set -o errexit -o nounset \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
@@ -30,7 +31,7 @@ RUN apt-get update \
         mercurial \
         openssh-client \
         subversion \
-    && rm -rf /var/lib/apt/lists/* \
+    && rm --recursive --force /var/lib/apt/lists/* \
     \
     && echo "Testing VCSes" \
     && which bzr \
diff --git a/jdk17-alpine/Dockerfile b/jdk17-alpine/Dockerfile
@@ -0,0 +1,51 @@
+FROM eclipse-temurin:17-jdk-alpine
+
+CMD ["gradle"]
+
+ENV GRADLE_HOME /opt/gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Adding gradle user and group" \
+    && addgroup -S -g 1000 gradle \
+    && adduser -D -S -G gradle -u 1000 -s /bin/ash gradle \
+    && mkdir /home/gradle/.gradle \
+    && chown -R gradle:gradle /home/gradle \
+    \
+    && echo "Symlinking root Gradle cache to gradle Gradle cache" \
+    && ln -s /home/gradle/.gradle /root/.gradle
+
+VOLUME /home/gradle/.gradle
+
+WORKDIR /home/gradle
+
+RUN set -o errexit -o nounset \
+    && echo "Installing VCSes" \
+    && apk add --no-cache \
+      git \
+      git-lfs \
+      mercurial \
+      subversion \
+    \
+    && echo "Testing VCSes" \
+    && which git \
+    && which git-lfs \
+    && which hg \
+    && which svn
+
+ENV GRADLE_VERSION 7.2
+ARG GRADLE_DOWNLOAD_SHA256=f581709a9c35e9cb92e16f585d2c4bc99b2b1a5f85d2badbd3dc6bff59e1e6dd
+RUN set -o errexit -o nounset \
+    && echo "Downloading Gradle" \
+    && wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
+    \
+    && echo "Checking download hash" \
+    && echo "${GRADLE_DOWNLOAD_SHA256} *gradle.zip" | sha256sum -c - \
+    \
+    && echo "Installing Gradle" \
+    && unzip gradle.zip \
+    && rm gradle.zip \
+    && mv "gradle-${GRADLE_VERSION}" "${GRADLE_HOME}/" \
+    && ln -s "${GRADLE_HOME}/bin/gradle" /usr/bin/gradle \
+    \
+    && echo "Testing Gradle installation" \
+    && gradle --version
diff --git a/jdk17/Dockerfile b/jdk17/Dockerfile
@@ -12,13 +12,14 @@ RUN set -o errexit -o nounset \
     && chown --recursive gradle:gradle /home/gradle \
     \
     && echo "Symlinking root Gradle cache to gradle Gradle cache" \
-    && ln -s /home/gradle/.gradle /root/.gradle
+    && ln --symbolic /home/gradle/.gradle /root/.gradle
 
 VOLUME /home/gradle/.gradle
 
 WORKDIR /home/gradle
 
-RUN apt-get update \
+RUN set -o errexit -o nounset \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
@@ -30,7 +31,7 @@ RUN apt-get update \
         mercurial \
         openssh-client \
         subversion \
-    && rm -rf /var/lib/apt/lists/* \
+    && rm --recursive --force /var/lib/apt/lists/* \
     \
     && echo "Testing VCSes" \
     && which bzr \
diff --git a/jdk8/Dockerfile b/jdk8/Dockerfile
@@ -12,13 +12,14 @@ RUN set -o errexit -o nounset \
     && chown --recursive gradle:gradle /home/gradle \
     \
     && echo "Symlinking root Gradle cache to gradle Gradle cache" \
-    && ln -s /home/gradle/.gradle /root/.gradle
+    && ln --symbolic /home/gradle/.gradle /root/.gradle
 
 VOLUME /home/gradle/.gradle
 
 WORKDIR /home/gradle
 
-RUN apt-get update \
+RUN set -o errexit -o nounset \
+    && apt-get update \
     && apt-get install --yes --no-install-recommends \
         fontconfig \
         unzip \
@@ -30,7 +31,7 @@ RUN apt-get update \
         mercurial \
         openssh-client \
         subversion \
-    && rm -rf /var/lib/apt/lists/* \
+    && rm --recursive --force /var/lib/apt/lists/* \
     \
     && echo "Testing VCSes" \
     && which bzr \
