From b46947e4ccdb17147af4227392e7d9c1991f8213 Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Sun, 8 May 2022 11:01:07 +0300 Subject: [PATCH] deb12 fix --- .../12-bookworm/jdk11/Dockerfile.adopted | 26 ------------------- .../12-bookworm/jdk11/docker-compose.yml | 5 ---- .../{jdk12 => jdk12.template}/Dockerfile | 0 .../Dockerfile.develop | 0 .../{jdk12 => jdk12.template}/Makefile | 0 .../docker-compose.yml | 0 .../{jdk13 => jdk13.template}/Dockerfile | 0 .../Dockerfile.develop | 0 .../{jdk13 => jdk13.template}/Makefile | 0 .../docker-compose.yml | 0 .../{jdk14 => jdk14.template}/Dockerfile | 0 .../Dockerfile.develop | 0 .../{jdk14 => jdk14.template}/Makefile | 0 .../docker-compose.yml | 0 .../{jdk15 => jdk15.template}/Dockerfile | 0 .../Dockerfile.develop | 0 .../{jdk15 => jdk15.template}/Makefile | 0 .../docker-compose.yml | 0 .../{jdk16 => jdk16.template}/Dockerfile | 0 .../Dockerfile.develop | 0 .../{jdk16 => jdk16.template}/Makefile | 0 .../docker-compose.yml | 0 .../12-bookworm/jdk8/Dockerfile.adopted | 23 ---------------- .../12-bookworm/jdk8/docker-compose.yml | 5 ---- 24 files changed, 59 deletions(-) delete mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.adopted rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk12 => jdk12.template}/Dockerfile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk12 => jdk12.template}/Dockerfile.develop (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk12 => jdk12.template}/Makefile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk12 => jdk12.template}/docker-compose.yml (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk13 => jdk13.template}/Dockerfile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk13 => jdk13.template}/Dockerfile.develop (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk13 => jdk13.template}/Makefile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk13 => jdk13.template}/docker-compose.yml (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk14 => jdk14.template}/Dockerfile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk14 => jdk14.template}/Dockerfile.develop (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk14 => jdk14.template}/Makefile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk14 => jdk14.template}/docker-compose.yml (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15 => jdk15.template}/Dockerfile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15 => jdk15.template}/Dockerfile.develop (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15 => jdk15.template}/Makefile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15 => jdk15.template}/docker-compose.yml (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16 => jdk16.template}/Dockerfile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16 => jdk16.template}/Dockerfile.develop (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16 => jdk16.template}/Makefile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16 => jdk16.template}/docker-compose.yml (100%) delete mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.adopted diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.adopted b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.adopted deleted file mode 100644 index 90e6c45fd..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.adopted +++ /dev/null @@ -1,26 +0,0 @@ -FROM epicmorg/debian:bookworm -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java11 -################################################################## -RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ - echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bookworm main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ - apt-get update && \ - apt-get autoremove -y && \ - apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \ - mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \ - ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \ - ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib && \ - java -version - -################################################################## -# cleanup -################################################################## -RUN apt-get purge policykit-1 -y && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml index df42c2704..f3c6a6ee0 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml @@ -4,11 +4,6 @@ services: image: "epicmorg/debian:bookworm-jdk11" build: context: . - app-old: - image: "epicmorg/debian:bookworm-jdk11-adopted" - build: - context: . - dockerfile: ./Dockerfile.adopted app-develop: image: "epicmorg/debian:bookworm-develop-jdk11" build: diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/Dockerfile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/Dockerfile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/Dockerfile.develop similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile.develop rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk12.template/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/Dockerfile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/Dockerfile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/Dockerfile.develop similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile.develop rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk13.template/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/Dockerfile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/Dockerfile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/Dockerfile.develop similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile.develop rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk14.template/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile.develop similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile.develop similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile.develop diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.adopted b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.adopted deleted file mode 100644 index fc2705859..000000000 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.adopted +++ /dev/null @@ -1,23 +0,0 @@ -FROM epicmorg/debian:bookworm -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java8 -################################################################## -RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ - echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bookworm main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ - apt-get update && \ - apt-get autoremove -y && \ - apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot && \ - java -version - -################################################################## -# cleanup -################################################################## -RUN apt-get purge policykit-1 -y && \ - apt-get clean -y && \ - apt-get autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /tmp/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml index ab6ce7fc3..35bf2fb86 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml @@ -4,11 +4,6 @@ services: image: "epicmorg/debian:bookworm-jdk8" build: context: . - app-old: - image: "epicmorg/debian:bookworm-jdk8-adopted" - build: - context: . - dockerfile: ./Dockerfile.adopted app-develop: image: "epicmorg/debian:bookworm-develop-jdk8" build: