From 237d66de7cdb57c9b64352b6371290020c94266d Mon Sep 17 00:00:00 2001 From: Carlos Sanchez Date: Tue, 30 Jul 2024 10:11:08 +0200 Subject: [PATCH] chore: remove procps curl from azulzulu debian --- README.md | 8 ++++---- azulzulu-11-debian/Dockerfile | 2 +- azulzulu-17-debian/Dockerfile | 2 +- azulzulu-21-debian/Dockerfile | 2 +- azulzulu-8-debian/Dockerfile | 2 +- tests/tests.bats | 6 ++++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index ead67383..4e602b0a 100644 --- a/README.md +++ b/README.md @@ -233,16 +233,16 @@ Some come from the parent images and some are installed in this image for backwa | amazoncorretto-21-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | azulzulu-8 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| azulzulu-8-debian | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| azulzulu-8-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | azulzulu-11 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-11-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| azulzulu-11-debian | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| azulzulu-11-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | azulzulu-17 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-17-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| azulzulu-17-debian | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| azulzulu-17-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | azulzulu-21 | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | azulzulu-21-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | -| azulzulu-21-debian | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | +| azulzulu-21-debian | | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | | ✔︎ | | eclipse-temurin-8 | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | eclipse-temurin-8-alpine | | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | | eclipse-temurin-8-focal | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | ✔︎ | | ✔︎ | diff --git a/azulzulu-11-debian/Dockerfile b/azulzulu-11-debian/Dockerfile index 34cd93ad..e57f5c5f 100644 --- a/azulzulu-11-debian/Dockerfile +++ b/azulzulu-11-debian/Dockerfile @@ -1,7 +1,7 @@ FROM azul/zulu-openjdk-debian:11 RUN apt-get update \ - && apt-get install -y --no-install-recommends openssh-client procps curl \ + && apt-get install -y --no-install-recommends openssh-client \ && rm -rf /var/lib/apt/lists/* # common for all images diff --git a/azulzulu-17-debian/Dockerfile b/azulzulu-17-debian/Dockerfile index 73b40208..1819b6fa 100644 --- a/azulzulu-17-debian/Dockerfile +++ b/azulzulu-17-debian/Dockerfile @@ -1,7 +1,7 @@ FROM azul/zulu-openjdk-debian:17 RUN apt-get update \ - && apt-get install -y --no-install-recommends openssh-client procps curl \ + && apt-get install -y --no-install-recommends openssh-client \ && rm -rf /var/lib/apt/lists/* # common for all images diff --git a/azulzulu-21-debian/Dockerfile b/azulzulu-21-debian/Dockerfile index 8abb1e35..542d8698 100644 --- a/azulzulu-21-debian/Dockerfile +++ b/azulzulu-21-debian/Dockerfile @@ -1,7 +1,7 @@ FROM azul/zulu-openjdk-debian:21 RUN apt-get update \ - && apt-get install -y --no-install-recommends openssh-client procps curl \ + && apt-get install -y --no-install-recommends openssh-client \ && rm -rf /var/lib/apt/lists/* # common for all images diff --git a/azulzulu-8-debian/Dockerfile b/azulzulu-8-debian/Dockerfile index af38b3a2..8ca0658e 100644 --- a/azulzulu-8-debian/Dockerfile +++ b/azulzulu-8-debian/Dockerfile @@ -1,7 +1,7 @@ FROM azul/zulu-openjdk-debian:8 RUN apt-get update \ - && apt-get install -y --no-install-recommends openssh-client procps curl \ + && apt-get install -y --no-install-recommends openssh-client \ && rm -rf /var/lib/apt/lists/* # common for all images diff --git a/tests/tests.bats b/tests/tests.bats index 341e6369..8c391aa0 100644 --- a/tests/tests.bats +++ b/tests/tests.bats @@ -94,7 +94,8 @@ base_image=eclipse-temurin-11 @test "$SUT_TAG curl is installed" { run docker run --rm $SUT_IMAGE:$SUT_TAG curl --version - if [[ "$SUT_TAG" == amazoncorretto-*-debian ]]; then + if [[ "$SUT_TAG" == amazoncorretto-*-debian ]] || + [[ "$SUT_TAG" == azulzulu-*-debian ]]; then [ $status -ne 0 ] else [ $status -eq 0 ] @@ -135,7 +136,8 @@ base_image=eclipse-temurin-11 [[ "$SUT_TAG" == "amazoncorretto-"* ]] || [[ "$SUT_TAG" == libericaopenjdk-*-debian ]] || [[ "$SUT_TAG" == openjdk-?? ]] || - [[ "$SUT_TAG" == *"graalvm"* ]] + [[ "$SUT_TAG" == *"graalvm"* ]] || + [[ "$SUT_TAG" == azulzulu-*-debian ]] ); then [ $status -eq 0 ]