From c5cdfe8a16af9f7155e694845a367d53118ad34f Mon Sep 17 00:00:00 2001 From: Patrick Evans Date: Mon, 23 Sep 2024 17:54:26 -0500 Subject: [PATCH 1/2] Add Dockerfiles for alpine-based images --- .../workflows/amazoncorretto-11-alpine.yml | 32 +++++++++++++++++++ .../workflows/amazoncorretto-17-alpine.yml | 32 +++++++++++++++++++ .../workflows/amazoncorretto-21-alpine.yml | 32 +++++++++++++++++++ .../workflows/amazoncorretto-23-alpine.yml | 32 +++++++++++++++++++ .github/workflows/amazoncorretto-8-alpine.yml | 32 +++++++++++++++++++ README.md | 12 ++++++- amazoncorretto-11-alpine/Dockerfile | 24 ++++++++++++++ amazoncorretto-17-alpine/Dockerfile | 24 ++++++++++++++ amazoncorretto-21-alpine/Dockerfile | 24 ++++++++++++++ amazoncorretto-23-alpine/Dockerfile | 24 ++++++++++++++ amazoncorretto-8-alpine/Dockerfile | 24 ++++++++++++++ 11 files changed, 291 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/amazoncorretto-11-alpine.yml create mode 100644 .github/workflows/amazoncorretto-17-alpine.yml create mode 100644 .github/workflows/amazoncorretto-21-alpine.yml create mode 100644 .github/workflows/amazoncorretto-23-alpine.yml create mode 100644 .github/workflows/amazoncorretto-8-alpine.yml create mode 100644 amazoncorretto-11-alpine/Dockerfile create mode 100644 amazoncorretto-17-alpine/Dockerfile create mode 100644 amazoncorretto-21-alpine/Dockerfile create mode 100644 amazoncorretto-23-alpine/Dockerfile create mode 100644 amazoncorretto-8-alpine/Dockerfile diff --git a/.github/workflows/amazoncorretto-11-alpine.yml b/.github/workflows/amazoncorretto-11-alpine.yml new file mode 100644 index 00000000..e31e5357 --- /dev/null +++ b/.github/workflows/amazoncorretto-11-alpine.yml @@ -0,0 +1,32 @@ +name: amazoncorretto-11-alpine + +on: + push: + branches: + - main + paths: + - "amazoncorretto-11-alpine/**" + - .github/workflows/amazoncorretto-11-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "amazoncorretto-11-alpine/**" + - .github/workflows/amazoncorretto-11-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: amazoncorretto-11-alpine + secrets: inherit diff --git a/.github/workflows/amazoncorretto-17-alpine.yml b/.github/workflows/amazoncorretto-17-alpine.yml new file mode 100644 index 00000000..3d7bdc6e --- /dev/null +++ b/.github/workflows/amazoncorretto-17-alpine.yml @@ -0,0 +1,32 @@ +name: amazoncorretto-17-alpine + +on: + push: + branches: + - main + paths: + - "amazoncorretto-17-alpine/**" + - .github/workflows/amazoncorretto-17-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "amazoncorretto-17-alpine/**" + - .github/workflows/amazoncorretto-17-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: amazoncorretto-17-alpine + secrets: inherit diff --git a/.github/workflows/amazoncorretto-21-alpine.yml b/.github/workflows/amazoncorretto-21-alpine.yml new file mode 100644 index 00000000..9f506f5b --- /dev/null +++ b/.github/workflows/amazoncorretto-21-alpine.yml @@ -0,0 +1,32 @@ +name: amazoncorretto-21-alpine + +on: + push: + branches: + - main + paths: + - "amazoncorretto-21-alpine/**" + - .github/workflows/amazoncorretto-21-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "amazoncorretto-21-alpine/**" + - .github/workflows/amazoncorretto-21-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: amazoncorretto-21-alpine + secrets: inherit diff --git a/.github/workflows/amazoncorretto-23-alpine.yml b/.github/workflows/amazoncorretto-23-alpine.yml new file mode 100644 index 00000000..87e397a8 --- /dev/null +++ b/.github/workflows/amazoncorretto-23-alpine.yml @@ -0,0 +1,32 @@ +name: amazoncorretto-23-alpine + +on: + push: + branches: + - main + paths: + - "amazoncorretto-23-alpine/**" + - .github/workflows/amazoncorretto-23-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "amazoncorretto-23-alpine/**" + - .github/workflows/amazoncorretto-23-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: amazoncorretto-23-alpine + secrets: inherit diff --git a/.github/workflows/amazoncorretto-8-alpine.yml b/.github/workflows/amazoncorretto-8-alpine.yml new file mode 100644 index 00000000..de51b296 --- /dev/null +++ b/.github/workflows/amazoncorretto-8-alpine.yml @@ -0,0 +1,32 @@ +name: amazoncorretto-8-alpine + +on: + push: + branches: + - main + paths: + - "amazoncorretto-8-alpine/**" + - .github/workflows/amazoncorretto-8-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + pull_request: + paths: + - "amazoncorretto-8-alpine/**" + - .github/workflows/amazoncorretto-8-alpine.yml + - .github/workflows/_template.yml + - common.sh + - tags-for-dir.sh + - "tests/**" + - "!tests/*.ps*" + - "!tests/*.windows" + +jobs: + build: + uses: ./.github/workflows/_template.yml + with: + directory: amazoncorretto-8-alpine + secrets: inherit diff --git a/README.md b/README.md index 23da8c7e..f609e6b4 100644 --- a/README.md +++ b/README.md @@ -35,18 +35,23 @@ See Docker Hub or GitHub Container Registry for an updated list of tags * [ibmjava-8](https://github.com/carlossg/docker-maven/blob/main/ibmjava-8/Dockerfile) * [amazoncorretto-8](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-8/Dockerfile) * [amazoncorretto-8-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-8-al2023/Dockerfile) +* [amazoncorretto-8-alpine](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-8-alpine/Dockerfile) * [amazoncorretto-8-debian](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-8-debian/Dockerfile) * [amazoncorretto-11](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-11/) * [amazoncorretto-11-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-11-al2023/Dockerfile) +* [amazoncorretto-11-alpine](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-11-alpine/Dockerfile) * [amazoncorretto-11-debian](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-11-debian/Dockerfile) * [amazoncorretto-17](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-17/) * [amazoncorretto-17-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-17-al2023/Dockerfile) +* [amazoncorretto-17-alpine](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-17-alpine/Dockerfile) * [amazoncorretto-17-debian](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-17-debian/Dockerfile) * [amazoncorretto-21](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-21/) * [amazoncorretto-21-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-21-al2023/) +* [amazoncorretto-21-alpine](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-21-alpine/Dockerfile) * [amazoncorretto-21-debian](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-21-debian/Dockerfile) * [amazoncorretto-23](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-23/) -* [amazoncorretto-23-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-23-al2023/) +* [amazoncorretto-23-al2023](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-23-al2023/Dockerfile) +* [amazoncorretto-23-alpine](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-17-alpine/Dockerfile) * [amazoncorretto-23-debian](https://github.com/carlossg/docker-maven/blob/main/amazoncorretto-23-debian/Dockerfile) * [sapmachine-11](https://github.com/carlossg/docker-maven/blob/main/sapmachine-11/) * [sapmachine-17](https://github.com/carlossg/docker-maven/blob/main/sapmachine-17/) @@ -220,18 +225,23 @@ Some come from the parent images and some are installed in this image for backwa |-------------------------------|-----|------|-----|------|-------|------|--------|-----|-----| | amazoncorretto-8 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | amazoncorretto-8-al2023 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | +| amazoncorretto-8-alpine | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-8-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-11 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | amazoncorretto-11-al2023 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | +| amazoncorretto-11-alpine | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-11-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-17 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | amazoncorretto-17-al2023 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | +| amazoncorretto-17-alpine | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-17-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-21 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | | amazoncorretto-21-al2023 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | ✔︎ | +| amazoncorretto-21-alpine | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-21-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-23 | | ✔︎ | | ✔︎ | | ✔︎ | | ✔︎ | ✔︎ | | amazoncorretto-23-al2023 | | ✔︎ | | ✔︎ | | ✔︎ | | ✔︎ | ✔︎ | +| amazoncorretto-23-alpine | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | amazoncorretto-23-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | azulzulu-8 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | diff --git a/amazoncorretto-11-alpine/Dockerfile b/amazoncorretto-11-alpine/Dockerfile new file mode 100644 index 00000000..8b01cc7a --- /dev/null +++ b/amazoncorretto-11-alpine/Dockerfile @@ -0,0 +1,24 @@ +FROM amazoncorretto:11-alpine + +RUN apk add --no-cache bash curl openssh-client + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/amazoncorretto-17-alpine/Dockerfile b/amazoncorretto-17-alpine/Dockerfile new file mode 100644 index 00000000..09e3cc5c --- /dev/null +++ b/amazoncorretto-17-alpine/Dockerfile @@ -0,0 +1,24 @@ +FROM amazoncorretto:17-alpine + +RUN apk add --no-cache bash curl openssh-client + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/amazoncorretto-21-alpine/Dockerfile b/amazoncorretto-21-alpine/Dockerfile new file mode 100644 index 00000000..9f5b1ecb --- /dev/null +++ b/amazoncorretto-21-alpine/Dockerfile @@ -0,0 +1,24 @@ +FROM amazoncorretto:21-alpine + +RUN apk add --no-cache bash curl openssh-client + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/amazoncorretto-23-alpine/Dockerfile b/amazoncorretto-23-alpine/Dockerfile new file mode 100644 index 00000000..f656d6b3 --- /dev/null +++ b/amazoncorretto-23-alpine/Dockerfile @@ -0,0 +1,24 @@ +FROM amazoncorretto:23-alpine + +RUN apk add --no-cache bash curl openssh-client + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] diff --git a/amazoncorretto-8-alpine/Dockerfile b/amazoncorretto-8-alpine/Dockerfile new file mode 100644 index 00000000..b393842a --- /dev/null +++ b/amazoncorretto-8-alpine/Dockerfile @@ -0,0 +1,24 @@ +FROM amazoncorretto:8-alpine + +RUN apk add --no-cache bash curl openssh-client + +# common for all images +LABEL org.opencontainers.image.title="Apache Maven" +LABEL org.opencontainers.image.source=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.url=https://github.com/carlossg/docker-maven +LABEL org.opencontainers.image.description="Apache Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, reporting and documentation from a central piece of information." + +ENV MAVEN_HOME=/usr/share/maven + +COPY --from=maven:3.9.9-eclipse-temurin-17 ${MAVEN_HOME} ${MAVEN_HOME} +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/local/bin/mvn-entrypoint.sh /usr/local/bin/mvn-entrypoint.sh +COPY --from=maven:3.9.9-eclipse-temurin-17 /usr/share/maven/ref/settings-docker.xml /usr/share/maven/ref/settings-docker.xml + +RUN ln -s ${MAVEN_HOME}/bin/mvn /usr/bin/mvn + +ARG MAVEN_VERSION=3.9.9 +ARG USER_HOME_DIR="/root" +ENV MAVEN_CONFIG="$USER_HOME_DIR/.m2" + +ENTRYPOINT ["/usr/local/bin/mvn-entrypoint.sh"] +CMD ["mvn"] From 1500c49fc1549c76a272f42d017a7c8bb75b5340 Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Tue, 24 Sep 2024 09:45:16 +0200 Subject: [PATCH 2/2] feat: amazon corretto alpine --- amazoncorretto-11-alpine/Dockerfile | 2 +- amazoncorretto-17-alpine/Dockerfile | 2 +- amazoncorretto-21-alpine/Dockerfile | 2 +- amazoncorretto-23-alpine/Dockerfile | 2 +- amazoncorretto-8-alpine/Dockerfile | 2 +- tests/tests.bats | 1 + 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/amazoncorretto-11-alpine/Dockerfile b/amazoncorretto-11-alpine/Dockerfile index 8b01cc7a..41b62443 100644 --- a/amazoncorretto-11-alpine/Dockerfile +++ b/amazoncorretto-11-alpine/Dockerfile @@ -1,6 +1,6 @@ FROM amazoncorretto:11-alpine -RUN apk add --no-cache bash curl openssh-client +RUN apk add --no-cache bash openssh-client # common for all images LABEL org.opencontainers.image.title="Apache Maven" diff --git a/amazoncorretto-17-alpine/Dockerfile b/amazoncorretto-17-alpine/Dockerfile index 09e3cc5c..12aa2f48 100644 --- a/amazoncorretto-17-alpine/Dockerfile +++ b/amazoncorretto-17-alpine/Dockerfile @@ -1,6 +1,6 @@ FROM amazoncorretto:17-alpine -RUN apk add --no-cache bash curl openssh-client +RUN apk add --no-cache bash openssh-client # common for all images LABEL org.opencontainers.image.title="Apache Maven" diff --git a/amazoncorretto-21-alpine/Dockerfile b/amazoncorretto-21-alpine/Dockerfile index 9f5b1ecb..f4abc811 100644 --- a/amazoncorretto-21-alpine/Dockerfile +++ b/amazoncorretto-21-alpine/Dockerfile @@ -1,6 +1,6 @@ FROM amazoncorretto:21-alpine -RUN apk add --no-cache bash curl openssh-client +RUN apk add --no-cache bash openssh-client # common for all images LABEL org.opencontainers.image.title="Apache Maven" diff --git a/amazoncorretto-23-alpine/Dockerfile b/amazoncorretto-23-alpine/Dockerfile index f656d6b3..5a8a1331 100644 --- a/amazoncorretto-23-alpine/Dockerfile +++ b/amazoncorretto-23-alpine/Dockerfile @@ -1,6 +1,6 @@ FROM amazoncorretto:23-alpine -RUN apk add --no-cache bash curl openssh-client +RUN apk add --no-cache bash openssh-client # common for all images LABEL org.opencontainers.image.title="Apache Maven" diff --git a/amazoncorretto-8-alpine/Dockerfile b/amazoncorretto-8-alpine/Dockerfile index b393842a..186d4afb 100644 --- a/amazoncorretto-8-alpine/Dockerfile +++ b/amazoncorretto-8-alpine/Dockerfile @@ -1,6 +1,6 @@ FROM amazoncorretto:8-alpine -RUN apk add --no-cache bash curl openssh-client +RUN apk add --no-cache bash openssh-client # common for all images LABEL org.opencontainers.image.title="Apache Maven" diff --git a/tests/tests.bats b/tests/tests.bats index 8db39735..9d85211e 100644 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -96,6 +96,7 @@ base_image=eclipse-temurin-17 @test "$SUT_TAG curl is installed" { if [[ "$SUT_TAG" == amazoncorretto-*-debian ]] || + [[ "$SUT_TAG" == amazoncorretto-*-alpine ]] || [[ "$SUT_TAG" == azulzulu-*-debian ]]; then run -127 docker run --rm $SUT_IMAGE:$SUT_TAG curl --version else