From 800eeb1d1cdc999fdc8fa2d70f357292d99f9e8c Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Mon, 9 May 2022 00:51:38 +0300 Subject: [PATCH] deb12 fix --- Makefile | 6 +++--- .../ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile | 2 +- .../epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop | 2 +- .../debian/12-bookworm/{jdk15.template => jdk15}/Dockerfile | 2 +- .../{jdk15.template => jdk15}/Dockerfile.develop | 2 +- .../debian/12-bookworm/{jdk15.template => jdk15}/Makefile | 0 .../{jdk15.template => jdk15}/docker-compose.yml | 0 .../debian/12-bookworm/{jdk16.template => jdk16}/Dockerfile | 2 +- .../{jdk16.template => jdk16}/Dockerfile.develop | 2 +- .../debian/12-bookworm/{jdk16.template => jdk16}/Makefile | 0 .../{jdk16.template => jdk16}/docker-compose.yml | 0 .../ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile | 2 +- .../epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop | 2 +- .../ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile | 2 +- .../epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15.template => jdk15}/Dockerfile (90%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15.template => jdk15}/Dockerfile.develop (90%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15.template => jdk15}/Makefile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk15.template => jdk15}/docker-compose.yml (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16.template => jdk16}/Dockerfile (90%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16.template => jdk16}/Dockerfile.develop (90%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16.template => jdk16}/Makefile (100%) rename linux/ecosystem/epicmorg/debian/12-bookworm/{jdk16.template => jdk16}/docker-compose.yml (100%) diff --git a/Makefile b/Makefile index cfc1e10b2..7d61d8542 100644 --- a/Makefile +++ b/Makefile @@ -197,9 +197,9 @@ ecosystem-debian-bookworm-images: cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13 && pwd && make build && make deploy - cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13 && pwd && make build && make deploy +# cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16 && pwd && make build && make deploy cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17 && pwd && make build && make deploy diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile index ad54a3513..6ec92fe86 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java11 ################################################################## RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - && \ - echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \ + echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated temurin-11-jdk && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop index ff6b70ecd..68bea2f44 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.develop @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java11 ################################################################## RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - && \ - echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \ + echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated temurin-11-jdk && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile similarity index 90% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile index ca1fb4a94..5a466ebba 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java15 ################################################################## 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 && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop similarity index 90% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile.develop rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop index e64b9938c..cd83c306d 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile.develop @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java15 ################################################################## 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 && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk15.template/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile similarity index 90% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile index 68160e22b..c88ba2448 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java16 ################################################################## 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 && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated adoptopenjdk-16-hotspot && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop similarity index 90% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile.develop rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop index 2ce33f575..54ae34824 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile.develop @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java16 ################################################################## 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 && \ + echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ bullseye main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated adoptopenjdk-16-hotspot && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml similarity index 100% rename from linux/ecosystem/epicmorg/debian/12-bookworm/jdk16.template/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile index 7bbe695a0..b9a1704e7 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java17 ################################################################## RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - && \ - echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \ + echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated temurin-17-jdk && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop index c667756c8..ed87fc8c5 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile.develop @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java17 ################################################################## RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - && \ - echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \ + echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated temurin-17-jdk && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile index 4dc01054b..78345f4b0 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java18 ################################################################## RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - && \ - echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \ + echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated temurin-18-jdk && \ diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop index 320212986..27d44ae37 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile.develop @@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive # installing java18 ################################################################## RUN wget -qO - https://packages.adoptium.net/artifactory/api/gpg/key/public | apt-key add - && \ - echo 'deb https://packages.adoptium.net/artifactory/deb bookworm main' > /etc/apt/sources.list.d/temurin-official.list && \ + echo 'deb https://packages.adoptium.net/artifactory/deb bullseye main' > /etc/apt/sources.list.d/temurin-official.list && \ apt-get update && \ apt-get autoremove -y && \ apt-get install -y --allow-unauthenticated temurin-18-jdk && \