From 6aca8c21ab779df309e5182c3e0106fdb735d7ad Mon Sep 17 00:00:00 2001 From: STAM Date: Fri, 4 Sep 2020 17:20:28 +0300 Subject: [PATCH] bullseye --- .travis.yml | 65 ++++++++++++++++++ epicmorg/README.md | 5 +- epicmorg/debian/sid/devel/jdk11/Makefile | 5 -- epicmorg/debian/sid/devel/jdk6/Makefile | 5 -- epicmorg/debian/sid/devel/jdk7/Makefile | 5 -- epicmorg/debian/sid/devel/jdk8/Makefile | 5 -- epicmorg/debian/sid/devel/main/Makefile | 5 -- epicmorg/debian/sid/edge/jdk11/Makefile | 5 -- epicmorg/debian/sid/edge/jdk6/Makefile | 5 -- epicmorg/debian/sid/edge/jdk7/Makefile | 5 -- epicmorg/debian/sid/edge/jdk8/Makefile | 5 -- epicmorg/debian/sid/edge/main/Makefile | 5 -- .../debian/sid/edge/main/sid.sources.list | 19 ----- epicmorg/debian/sid/edge/main/sources.list | 19 ----- .../edge => devel-bullseye}/jdk11/Dockerfile | 2 +- epicmorg/devel-bullseye/jdk11/Makefile | 5 ++ .../devel => devel-bullseye}/jdk6/Dockerfile | 2 +- epicmorg/devel-bullseye/jdk6/Makefile | 5 ++ .../edge => devel-bullseye}/jdk7/Dockerfile | 2 +- epicmorg/devel-bullseye/jdk7/Makefile | 5 ++ .../devel => devel-bullseye}/jdk8/Dockerfile | 2 +- epicmorg/devel-bullseye/jdk8/Makefile | 5 ++ .../devel => devel-bullseye}/main/Dockerfile | 2 +- epicmorg/devel-bullseye/main/Makefile | 5 ++ .../bullseye => }/devel/jdk11/Dockerfile | 0 .../bullseye => }/devel/jdk11/Makefile | 0 .../bullseye => }/devel/jdk6/Dockerfile | 0 .../{debian/bullseye => }/devel/jdk6/Makefile | 0 .../bullseye => }/devel/jdk7/Dockerfile | 0 .../{debian/bullseye => }/devel/jdk7/Makefile | 0 .../bullseye => }/devel/jdk8/Dockerfile | 0 .../{debian/bullseye => }/devel/jdk8/Makefile | 0 .../bullseye => }/devel/main/Dockerfile | 0 .../{debian/bullseye => }/devel/main/Makefile | 0 .../bullseye/egde => edge}/jdk11/Dockerfile | 0 .../bullseye/egde => edge}/jdk11/Makefile | 0 .../bullseye/egde => edge}/jdk6/Dockerfile | 0 .../bullseye/egde => edge}/jdk6/Makefile | 0 .../bullseye/egde => edge}/jdk7/Dockerfile | 0 .../bullseye/egde => edge}/jdk7/Makefile | 0 .../bullseye/egde => edge}/jdk8/Dockerfile | 0 .../bullseye/egde => edge}/jdk8/Makefile | 0 .../bullseye/egde => edge}/main/Dockerfile | 0 .../bullseye/egde => edge}/main/Makefile | 0 .../main/sources.list} | 0 .../devel => egde-bullseye}/jdk11/Dockerfile | 2 +- epicmorg/egde-bullseye/jdk11/Makefile | 5 ++ .../edge => egde-bullseye}/jdk6/Dockerfile | 2 +- epicmorg/egde-bullseye/jdk6/Makefile | 5 ++ .../devel => egde-bullseye}/jdk7/Dockerfile | 2 +- epicmorg/egde-bullseye/jdk7/Makefile | 5 ++ .../edge => egde-bullseye}/jdk8/Dockerfile | 2 +- epicmorg/egde-bullseye/jdk8/Makefile | 5 ++ .../edge => egde-bullseye}/main/Dockerfile | 0 epicmorg/egde-bullseye/main/Makefile | 5 ++ .../egde => egde-bullseye}/main/sources.list | 0 .../{debian/buster => }/prod/jdk11/Dockerfile | 0 .../{debian/buster => }/prod/jdk11/Makefile | 0 .../{debian/buster => }/prod/jdk6/Dockerfile | 0 .../{debian/buster => }/prod/jdk6/Makefile | 0 .../{debian/buster => }/prod/jdk7/Dockerfile | 0 .../{debian/buster => }/prod/jdk7/Makefile | 0 .../{debian/buster => }/prod/jdk8/Dockerfile | 0 .../{debian/buster => }/prod/jdk8/Makefile | 0 .../{debian/buster => }/prod/main/Dockerfile | 0 .../{debian/buster => }/prod/main/Makefile | 0 .../prod/main/deb-multimedia-keyring.gpg | Bin .../{debian/buster => }/prod/main/locale.gen | 0 .../buster => }/prod/main/locale.gen.full | 0 .../buster => }/prod/main/sources.list | 0 70 files changed, 128 insertions(+), 98 deletions(-) delete mode 100644 epicmorg/debian/sid/devel/jdk11/Makefile delete mode 100644 epicmorg/debian/sid/devel/jdk6/Makefile delete mode 100644 epicmorg/debian/sid/devel/jdk7/Makefile delete mode 100644 epicmorg/debian/sid/devel/jdk8/Makefile delete mode 100644 epicmorg/debian/sid/devel/main/Makefile delete mode 100644 epicmorg/debian/sid/edge/jdk11/Makefile delete mode 100644 epicmorg/debian/sid/edge/jdk6/Makefile delete mode 100644 epicmorg/debian/sid/edge/jdk7/Makefile delete mode 100644 epicmorg/debian/sid/edge/jdk8/Makefile delete mode 100644 epicmorg/debian/sid/edge/main/Makefile delete mode 100644 epicmorg/debian/sid/edge/main/sid.sources.list delete mode 100644 epicmorg/debian/sid/edge/main/sources.list rename epicmorg/{debian/sid/edge => devel-bullseye}/jdk11/Dockerfile (97%) create mode 100644 epicmorg/devel-bullseye/jdk11/Makefile rename epicmorg/{debian/sid/devel => devel-bullseye}/jdk6/Dockerfile (96%) create mode 100644 epicmorg/devel-bullseye/jdk6/Makefile rename epicmorg/{debian/sid/edge => devel-bullseye}/jdk7/Dockerfile (96%) create mode 100644 epicmorg/devel-bullseye/jdk7/Makefile rename epicmorg/{debian/sid/devel => devel-bullseye}/jdk8/Dockerfile (96%) create mode 100644 epicmorg/devel-bullseye/jdk8/Makefile rename epicmorg/{debian/sid/devel => devel-bullseye}/main/Dockerfile (98%) create mode 100644 epicmorg/devel-bullseye/main/Makefile rename epicmorg/{debian/bullseye => }/devel/jdk11/Dockerfile (100%) rename epicmorg/{debian/bullseye => }/devel/jdk11/Makefile (100%) rename epicmorg/{debian/bullseye => }/devel/jdk6/Dockerfile (100%) rename epicmorg/{debian/bullseye => }/devel/jdk6/Makefile (100%) rename epicmorg/{debian/bullseye => }/devel/jdk7/Dockerfile (100%) rename epicmorg/{debian/bullseye => }/devel/jdk7/Makefile (100%) rename epicmorg/{debian/bullseye => }/devel/jdk8/Dockerfile (100%) rename epicmorg/{debian/bullseye => }/devel/jdk8/Makefile (100%) rename epicmorg/{debian/bullseye => }/devel/main/Dockerfile (100%) rename epicmorg/{debian/bullseye => }/devel/main/Makefile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk11/Dockerfile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk11/Makefile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk6/Dockerfile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk6/Makefile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk7/Dockerfile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk7/Makefile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk8/Dockerfile (100%) rename epicmorg/{debian/bullseye/egde => edge}/jdk8/Makefile (100%) rename epicmorg/{debian/bullseye/egde => edge}/main/Dockerfile (100%) rename epicmorg/{debian/bullseye/egde => edge}/main/Makefile (100%) rename epicmorg/{debian/bullseye/egde/main/sid.sources.list => edge/main/sources.list} (100%) rename epicmorg/{debian/sid/devel => egde-bullseye}/jdk11/Dockerfile (97%) create mode 100644 epicmorg/egde-bullseye/jdk11/Makefile rename epicmorg/{debian/sid/edge => egde-bullseye}/jdk6/Dockerfile (96%) create mode 100644 epicmorg/egde-bullseye/jdk6/Makefile rename epicmorg/{debian/sid/devel => egde-bullseye}/jdk7/Dockerfile (96%) create mode 100644 epicmorg/egde-bullseye/jdk7/Makefile rename epicmorg/{debian/sid/edge => egde-bullseye}/jdk8/Dockerfile (97%) create mode 100644 epicmorg/egde-bullseye/jdk8/Makefile rename epicmorg/{debian/sid/edge => egde-bullseye}/main/Dockerfile (100%) create mode 100644 epicmorg/egde-bullseye/main/Makefile rename epicmorg/{debian/bullseye/egde => egde-bullseye}/main/sources.list (100%) rename epicmorg/{debian/buster => }/prod/jdk11/Dockerfile (100%) rename epicmorg/{debian/buster => }/prod/jdk11/Makefile (100%) rename epicmorg/{debian/buster => }/prod/jdk6/Dockerfile (100%) rename epicmorg/{debian/buster => }/prod/jdk6/Makefile (100%) rename epicmorg/{debian/buster => }/prod/jdk7/Dockerfile (100%) rename epicmorg/{debian/buster => }/prod/jdk7/Makefile (100%) rename epicmorg/{debian/buster => }/prod/jdk8/Dockerfile (100%) rename epicmorg/{debian/buster => }/prod/jdk8/Makefile (100%) rename epicmorg/{debian/buster => }/prod/main/Dockerfile (100%) rename epicmorg/{debian/buster => }/prod/main/Makefile (100%) rename epicmorg/{debian/buster => }/prod/main/deb-multimedia-keyring.gpg (100%) rename epicmorg/{debian/buster => }/prod/main/locale.gen (100%) rename epicmorg/{debian/buster => }/prod/main/locale.gen.full (100%) rename epicmorg/{debian/buster => }/prod/main/sources.list (100%) diff --git a/.travis.yml b/.travis.yml index da354df0d..2c7c8a78f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -116,6 +116,38 @@ matrix: - docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge/jdk11 - docker push epicmorg/edge:jdk11 +########## + + - name: Base Edge Bullseye + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/edge:bullseye epicmorg/edge-bullseye/main + - docker push epicmorg/edge:bullseye + + - name: Base Edge Bullseye + JDK 6 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/edge:jdk6 epicmorg/edge-bullseye/jdk6 + - docker push epicmorg/edge:bullseye-jdk6 + + - name: Base Edge Bullseye + JDK 7 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/edge:jdk7 epicmorg/edge-bullseye/jdk7 + - docker push epicmorg/edge:bullseye-jdk7 + + - name: Base Edge Bullseye + JDK 8 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/edge:jdk8 epicmorg/edge-bullseye/jdk8 + - docker push epicmorg/edge:bullseye-jdk8 + + - name: Base Edge Bullseye + JDK 11 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/edge:jdk11 epicmorg/edge-bullseye/jdk11 + - docker push epicmorg/edge:bullseye-jdk11 + ########## - name: Base Develop @@ -148,6 +180,39 @@ matrix: - docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11 - docker push epicmorg/devel:jdk11 + +########## + + - name: Base Develop Bullseye + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:bullseye epicmorg/devel-bullseye/main + - docker push epicmorg/devel:bullseye + + - name: Base Develop + JDK 6 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk6 epicmorg/devel-bullseye/jdk6 + - docker push epicmorg/devel:bullseye-jdk6 + + - name: Base Develop + JDK 7 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk7 epicmorg/devel-bullseye/jdk7 + - docker push epicmorg/devel:bullseye-jdk7 + + - name: Base Develop + JDK 8 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk8 epicmorg/devel-bullseye/jdk8 + - docker push epicmorg/devel:bullseye-jdk8 + + - name: Base Develop + JDK 11 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11 + - docker push epicmorg/devel:bullseye-jdk11 + ########## - name: TeamCity Agent diff --git a/epicmorg/README.md b/epicmorg/README.md index 3d25e59b6..e51402540 100644 --- a/epicmorg/README.md +++ b/epicmorg/README.md @@ -2,4 +2,7 @@ * `base` - main image based from debian `buster-slim` with enhanced `sources.list`. * `edge` - more recent system image. based on `base` image with switched to `sid` (`sid-slim`) update-channel. -* `devel` - just enhanced `edge` image with preinstalled some pre requirements. \ No newline at end of file +* `devel` - just enhanced `edge` image with preinstalled some pre requirements. + +* `egde-bullseye` - more recent system image. based on `base` image with switched to `bullseye` (`bullseye-slim`) update-channel. +* `devel-bullseye` - just enhanced `egde-bullseye` image with preinstalled some pre requirements. \ No newline at end of file diff --git a/epicmorg/debian/sid/devel/jdk11/Makefile b/epicmorg/debian/sid/devel/jdk11/Makefile deleted file mode 100644 index 62e0280e0..000000000 --- a/epicmorg/debian/sid/devel/jdk11/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/devel:jdk11 . - docker push epicmorg/devel:jdk11 - diff --git a/epicmorg/debian/sid/devel/jdk6/Makefile b/epicmorg/debian/sid/devel/jdk6/Makefile deleted file mode 100644 index 6c683ad45..000000000 --- a/epicmorg/debian/sid/devel/jdk6/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/devel:jdk6 . - docker push epicmorg/devel:jdk6 - diff --git a/epicmorg/debian/sid/devel/jdk7/Makefile b/epicmorg/debian/sid/devel/jdk7/Makefile deleted file mode 100644 index 227771561..000000000 --- a/epicmorg/debian/sid/devel/jdk7/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/devel:jdk7 . - docker push epicmorg/devel:jdk7 - diff --git a/epicmorg/debian/sid/devel/jdk8/Makefile b/epicmorg/debian/sid/devel/jdk8/Makefile deleted file mode 100644 index 17f27ca0e..000000000 --- a/epicmorg/debian/sid/devel/jdk8/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/devel:jdk8 . - docker push epicmorg/devel:jdk8 - diff --git a/epicmorg/debian/sid/devel/main/Makefile b/epicmorg/debian/sid/devel/main/Makefile deleted file mode 100644 index e40fa6bff..000000000 --- a/epicmorg/debian/sid/devel/main/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/devel . - docker push epicmorg/devel - diff --git a/epicmorg/debian/sid/edge/jdk11/Makefile b/epicmorg/debian/sid/edge/jdk11/Makefile deleted file mode 100644 index 1bcad05b2..000000000 --- a/epicmorg/debian/sid/edge/jdk11/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge:jdk11 . - docker push epicmorg/edge:jdk11 - diff --git a/epicmorg/debian/sid/edge/jdk6/Makefile b/epicmorg/debian/sid/edge/jdk6/Makefile deleted file mode 100644 index d02c51767..000000000 --- a/epicmorg/debian/sid/edge/jdk6/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/edge:jdk6 . - docker push epicmorg/edge:jdk6 - diff --git a/epicmorg/debian/sid/edge/jdk7/Makefile b/epicmorg/debian/sid/edge/jdk7/Makefile deleted file mode 100644 index ca513d304..000000000 --- a/epicmorg/debian/sid/edge/jdk7/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/edge:jdk7 . - docker push epicmorg/edge:jdk7 - diff --git a/epicmorg/debian/sid/edge/jdk8/Makefile b/epicmorg/debian/sid/edge/jdk8/Makefile deleted file mode 100644 index 6a17f6dc8..000000000 --- a/epicmorg/debian/sid/edge/jdk8/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge:jdk8 . - docker push epicmorg/edge:jdk8 - diff --git a/epicmorg/debian/sid/edge/main/Makefile b/epicmorg/debian/sid/edge/main/Makefile deleted file mode 100644 index c44f1d984..000000000 --- a/epicmorg/debian/sid/edge/main/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgdev -emgdev: - docker build --compress -t epicmorg/edge . - docker push epicmorg/edge - diff --git a/epicmorg/debian/sid/edge/main/sid.sources.list b/epicmorg/debian/sid/edge/main/sid.sources.list deleted file mode 100644 index 677a95436..000000000 --- a/epicmorg/debian/sid/edge/main/sid.sources.list +++ /dev/null @@ -1,19 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ sid main contrib non-free -deb http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ testing-updates main contrib non-free -deb http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ testing-proposed-updates main contrib non-free - -#backports -#deb http://ftp.ru.debian.org/debian/ testing-backports main contrib non-free -#deb-src http://ftp.ru.debian.org/debian/ testing-backports main contrib non-free - -#security -deb http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free -deb-src http://ftp.ru.debian.org/debian-security/ testing-security main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ sid main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ sid main non-free diff --git a/epicmorg/debian/sid/edge/main/sources.list b/epicmorg/debian/sid/edge/main/sources.list deleted file mode 100644 index 7aa315b6f..000000000 --- a/epicmorg/debian/sid/edge/main/sources.list +++ /dev/null @@ -1,19 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ bullseye main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye main contrib non-free -deb http://ftp.ru.debian.org/debian/ bullseye-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye-updates main contrib non-free -deb http://ftp.ru.debian.org/debian/ bullseye-backports main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye-backports main contrib non-free -deb http://ftp.ru.debian.org/debian/ bullseye-proposed-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ bullseye-proposed-updates main contrib non-free - -#security -#deb http://ftp.ru.debian.org/debian-security/ bullseye/updates main contrib non-free -#deb-src http://ftp.ru.debian.org/debian-security/ bullseye/updates main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ bullseye main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ bullseye main non-free -#deb http://ftp.ru.debian.org/debian-multimedia/ bullseye-backports main -#deb-src http://ftp.ru.debian.org/debian-multimedia/ bullseye-backports main diff --git a/epicmorg/debian/sid/edge/jdk11/Dockerfile b/epicmorg/devel-bullseye/jdk11/Dockerfile similarity index 97% rename from epicmorg/debian/sid/edge/jdk11/Dockerfile rename to epicmorg/devel-bullseye/jdk11/Dockerfile index af321551d..40e38afb7 100644 --- a/epicmorg/debian/sid/edge/jdk11/Dockerfile +++ b/epicmorg/devel-bullseye/jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/edge +FROM epicmorg/devel:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/devel-bullseye/jdk11/Makefile b/epicmorg/devel-bullseye/jdk11/Makefile new file mode 100644 index 000000000..b9d772bb9 --- /dev/null +++ b/epicmorg/devel-bullseye/jdk11/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/devel:bullseye-jdk11 . + docker push epicmorg/devel:bullseye-jdk11 + diff --git a/epicmorg/debian/sid/devel/jdk6/Dockerfile b/epicmorg/devel-bullseye/jdk6/Dockerfile similarity index 96% rename from epicmorg/debian/sid/devel/jdk6/Dockerfile rename to epicmorg/devel-bullseye/jdk6/Dockerfile index 477630f7a..c7868c0d6 100644 --- a/epicmorg/debian/sid/devel/jdk6/Dockerfile +++ b/epicmorg/devel-bullseye/jdk6/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/devel:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/devel-bullseye/jdk6/Makefile b/epicmorg/devel-bullseye/jdk6/Makefile new file mode 100644 index 000000000..2524a5ef3 --- /dev/null +++ b/epicmorg/devel-bullseye/jdk6/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/devel:bullseye-jdk6 . + docker push epicmorg/devel:bullseye-jdk6 + diff --git a/epicmorg/debian/sid/edge/jdk7/Dockerfile b/epicmorg/devel-bullseye/jdk7/Dockerfile similarity index 96% rename from epicmorg/debian/sid/edge/jdk7/Dockerfile rename to epicmorg/devel-bullseye/jdk7/Dockerfile index bf4c2dc83..134f56db6 100644 --- a/epicmorg/debian/sid/edge/jdk7/Dockerfile +++ b/epicmorg/devel-bullseye/jdk7/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/edge +FROM epicmorg/devel:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/devel-bullseye/jdk7/Makefile b/epicmorg/devel-bullseye/jdk7/Makefile new file mode 100644 index 000000000..ac1c20a99 --- /dev/null +++ b/epicmorg/devel-bullseye/jdk7/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/devel:bullseye-jdk7 . + docker push epicmorg/devel:bullseye-jdk7 + diff --git a/epicmorg/debian/sid/devel/jdk8/Dockerfile b/epicmorg/devel-bullseye/jdk8/Dockerfile similarity index 96% rename from epicmorg/debian/sid/devel/jdk8/Dockerfile rename to epicmorg/devel-bullseye/jdk8/Dockerfile index c8442c274..f4f1c51a5 100644 --- a/epicmorg/debian/sid/devel/jdk8/Dockerfile +++ b/epicmorg/devel-bullseye/jdk8/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/devel:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/devel-bullseye/jdk8/Makefile b/epicmorg/devel-bullseye/jdk8/Makefile new file mode 100644 index 000000000..78a311c87 --- /dev/null +++ b/epicmorg/devel-bullseye/jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/devel:bullseye-jdk8 . + docker push epicmorg/devel:bullseye-jdk8 + diff --git a/epicmorg/debian/sid/devel/main/Dockerfile b/epicmorg/devel-bullseye/main/Dockerfile similarity index 98% rename from epicmorg/debian/sid/devel/main/Dockerfile rename to epicmorg/devel-bullseye/main/Dockerfile index a0717cc9e..7cac181e0 100644 --- a/epicmorg/debian/sid/devel/main/Dockerfile +++ b/epicmorg/devel-bullseye/main/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/edge +FROM epicmorg/edge:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/devel-bullseye/main/Makefile b/epicmorg/devel-bullseye/main/Makefile new file mode 100644 index 000000000..b748fba07 --- /dev/null +++ b/epicmorg/devel-bullseye/main/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/devel:bullseye . + docker push epicmorg/devel:bullseye + diff --git a/epicmorg/debian/bullseye/devel/jdk11/Dockerfile b/epicmorg/devel/jdk11/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk11/Dockerfile rename to epicmorg/devel/jdk11/Dockerfile diff --git a/epicmorg/debian/bullseye/devel/jdk11/Makefile b/epicmorg/devel/jdk11/Makefile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk11/Makefile rename to epicmorg/devel/jdk11/Makefile diff --git a/epicmorg/debian/bullseye/devel/jdk6/Dockerfile b/epicmorg/devel/jdk6/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk6/Dockerfile rename to epicmorg/devel/jdk6/Dockerfile diff --git a/epicmorg/debian/bullseye/devel/jdk6/Makefile b/epicmorg/devel/jdk6/Makefile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk6/Makefile rename to epicmorg/devel/jdk6/Makefile diff --git a/epicmorg/debian/bullseye/devel/jdk7/Dockerfile b/epicmorg/devel/jdk7/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk7/Dockerfile rename to epicmorg/devel/jdk7/Dockerfile diff --git a/epicmorg/debian/bullseye/devel/jdk7/Makefile b/epicmorg/devel/jdk7/Makefile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk7/Makefile rename to epicmorg/devel/jdk7/Makefile diff --git a/epicmorg/debian/bullseye/devel/jdk8/Dockerfile b/epicmorg/devel/jdk8/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk8/Dockerfile rename to epicmorg/devel/jdk8/Dockerfile diff --git a/epicmorg/debian/bullseye/devel/jdk8/Makefile b/epicmorg/devel/jdk8/Makefile similarity index 100% rename from epicmorg/debian/bullseye/devel/jdk8/Makefile rename to epicmorg/devel/jdk8/Makefile diff --git a/epicmorg/debian/bullseye/devel/main/Dockerfile b/epicmorg/devel/main/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/devel/main/Dockerfile rename to epicmorg/devel/main/Dockerfile diff --git a/epicmorg/debian/bullseye/devel/main/Makefile b/epicmorg/devel/main/Makefile similarity index 100% rename from epicmorg/debian/bullseye/devel/main/Makefile rename to epicmorg/devel/main/Makefile diff --git a/epicmorg/debian/bullseye/egde/jdk11/Dockerfile b/epicmorg/edge/jdk11/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk11/Dockerfile rename to epicmorg/edge/jdk11/Dockerfile diff --git a/epicmorg/debian/bullseye/egde/jdk11/Makefile b/epicmorg/edge/jdk11/Makefile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk11/Makefile rename to epicmorg/edge/jdk11/Makefile diff --git a/epicmorg/debian/bullseye/egde/jdk6/Dockerfile b/epicmorg/edge/jdk6/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk6/Dockerfile rename to epicmorg/edge/jdk6/Dockerfile diff --git a/epicmorg/debian/bullseye/egde/jdk6/Makefile b/epicmorg/edge/jdk6/Makefile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk6/Makefile rename to epicmorg/edge/jdk6/Makefile diff --git a/epicmorg/debian/bullseye/egde/jdk7/Dockerfile b/epicmorg/edge/jdk7/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk7/Dockerfile rename to epicmorg/edge/jdk7/Dockerfile diff --git a/epicmorg/debian/bullseye/egde/jdk7/Makefile b/epicmorg/edge/jdk7/Makefile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk7/Makefile rename to epicmorg/edge/jdk7/Makefile diff --git a/epicmorg/debian/bullseye/egde/jdk8/Dockerfile b/epicmorg/edge/jdk8/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk8/Dockerfile rename to epicmorg/edge/jdk8/Dockerfile diff --git a/epicmorg/debian/bullseye/egde/jdk8/Makefile b/epicmorg/edge/jdk8/Makefile similarity index 100% rename from epicmorg/debian/bullseye/egde/jdk8/Makefile rename to epicmorg/edge/jdk8/Makefile diff --git a/epicmorg/debian/bullseye/egde/main/Dockerfile b/epicmorg/edge/main/Dockerfile similarity index 100% rename from epicmorg/debian/bullseye/egde/main/Dockerfile rename to epicmorg/edge/main/Dockerfile diff --git a/epicmorg/debian/bullseye/egde/main/Makefile b/epicmorg/edge/main/Makefile similarity index 100% rename from epicmorg/debian/bullseye/egde/main/Makefile rename to epicmorg/edge/main/Makefile diff --git a/epicmorg/debian/bullseye/egde/main/sid.sources.list b/epicmorg/edge/main/sources.list similarity index 100% rename from epicmorg/debian/bullseye/egde/main/sid.sources.list rename to epicmorg/edge/main/sources.list diff --git a/epicmorg/debian/sid/devel/jdk11/Dockerfile b/epicmorg/egde-bullseye/jdk11/Dockerfile similarity index 97% rename from epicmorg/debian/sid/devel/jdk11/Dockerfile rename to epicmorg/egde-bullseye/jdk11/Dockerfile index 3c99bceda..b947fb38b 100644 --- a/epicmorg/debian/sid/devel/jdk11/Dockerfile +++ b/epicmorg/egde-bullseye/jdk11/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/egde:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/egde-bullseye/jdk11/Makefile b/epicmorg/egde-bullseye/jdk11/Makefile new file mode 100644 index 000000000..851aea2c4 --- /dev/null +++ b/epicmorg/egde-bullseye/jdk11/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/edge:bullseye-jdk11 . + docker push epicmorg/edge:bullseye-jdk11 + diff --git a/epicmorg/debian/sid/edge/jdk6/Dockerfile b/epicmorg/egde-bullseye/jdk6/Dockerfile similarity index 96% rename from epicmorg/debian/sid/edge/jdk6/Dockerfile rename to epicmorg/egde-bullseye/jdk6/Dockerfile index 189601b1f..634a3ed7d 100644 --- a/epicmorg/debian/sid/edge/jdk6/Dockerfile +++ b/epicmorg/egde-bullseye/jdk6/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/edge +FROM epicmorg/edge:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/egde-bullseye/jdk6/Makefile b/epicmorg/egde-bullseye/jdk6/Makefile new file mode 100644 index 000000000..365bf997e --- /dev/null +++ b/epicmorg/egde-bullseye/jdk6/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/edge:bullseye-jdk6 . + docker push epicmorg/edge:bullseye-jdk6 + diff --git a/epicmorg/debian/sid/devel/jdk7/Dockerfile b/epicmorg/egde-bullseye/jdk7/Dockerfile similarity index 96% rename from epicmorg/debian/sid/devel/jdk7/Dockerfile rename to epicmorg/egde-bullseye/jdk7/Dockerfile index 828853acb..d168a0a25 100644 --- a/epicmorg/debian/sid/devel/jdk7/Dockerfile +++ b/epicmorg/egde-bullseye/jdk7/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/edge:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/egde-bullseye/jdk7/Makefile b/epicmorg/egde-bullseye/jdk7/Makefile new file mode 100644 index 000000000..5e0a1fa24 --- /dev/null +++ b/epicmorg/egde-bullseye/jdk7/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/edge:bullseye-jdk7 . + docker push epicmorg/edge:bullseye-jdk7 + diff --git a/epicmorg/debian/sid/edge/jdk8/Dockerfile b/epicmorg/egde-bullseye/jdk8/Dockerfile similarity index 97% rename from epicmorg/debian/sid/edge/jdk8/Dockerfile rename to epicmorg/egde-bullseye/jdk8/Dockerfile index fc85fe4e5..cb28223cc 100644 --- a/epicmorg/debian/sid/edge/jdk8/Dockerfile +++ b/epicmorg/egde-bullseye/jdk8/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/edge +FROM epicmorg/edge:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/epicmorg/egde-bullseye/jdk8/Makefile b/epicmorg/egde-bullseye/jdk8/Makefile new file mode 100644 index 000000000..226c0e1c0 --- /dev/null +++ b/epicmorg/egde-bullseye/jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/edge:bullseye-jdk8 . + docker push epicmorg/edge:bullseye-jdk8 + diff --git a/epicmorg/debian/sid/edge/main/Dockerfile b/epicmorg/egde-bullseye/main/Dockerfile similarity index 100% rename from epicmorg/debian/sid/edge/main/Dockerfile rename to epicmorg/egde-bullseye/main/Dockerfile diff --git a/epicmorg/egde-bullseye/main/Makefile b/epicmorg/egde-bullseye/main/Makefile new file mode 100644 index 000000000..a8a71c1ac --- /dev/null +++ b/epicmorg/egde-bullseye/main/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/egde:bullseye . + docker push epicmorg/egde:bullseye + diff --git a/epicmorg/debian/bullseye/egde/main/sources.list b/epicmorg/egde-bullseye/main/sources.list similarity index 100% rename from epicmorg/debian/bullseye/egde/main/sources.list rename to epicmorg/egde-bullseye/main/sources.list diff --git a/epicmorg/debian/buster/prod/jdk11/Dockerfile b/epicmorg/prod/jdk11/Dockerfile similarity index 100% rename from epicmorg/debian/buster/prod/jdk11/Dockerfile rename to epicmorg/prod/jdk11/Dockerfile diff --git a/epicmorg/debian/buster/prod/jdk11/Makefile b/epicmorg/prod/jdk11/Makefile similarity index 100% rename from epicmorg/debian/buster/prod/jdk11/Makefile rename to epicmorg/prod/jdk11/Makefile diff --git a/epicmorg/debian/buster/prod/jdk6/Dockerfile b/epicmorg/prod/jdk6/Dockerfile similarity index 100% rename from epicmorg/debian/buster/prod/jdk6/Dockerfile rename to epicmorg/prod/jdk6/Dockerfile diff --git a/epicmorg/debian/buster/prod/jdk6/Makefile b/epicmorg/prod/jdk6/Makefile similarity index 100% rename from epicmorg/debian/buster/prod/jdk6/Makefile rename to epicmorg/prod/jdk6/Makefile diff --git a/epicmorg/debian/buster/prod/jdk7/Dockerfile b/epicmorg/prod/jdk7/Dockerfile similarity index 100% rename from epicmorg/debian/buster/prod/jdk7/Dockerfile rename to epicmorg/prod/jdk7/Dockerfile diff --git a/epicmorg/debian/buster/prod/jdk7/Makefile b/epicmorg/prod/jdk7/Makefile similarity index 100% rename from epicmorg/debian/buster/prod/jdk7/Makefile rename to epicmorg/prod/jdk7/Makefile diff --git a/epicmorg/debian/buster/prod/jdk8/Dockerfile b/epicmorg/prod/jdk8/Dockerfile similarity index 100% rename from epicmorg/debian/buster/prod/jdk8/Dockerfile rename to epicmorg/prod/jdk8/Dockerfile diff --git a/epicmorg/debian/buster/prod/jdk8/Makefile b/epicmorg/prod/jdk8/Makefile similarity index 100% rename from epicmorg/debian/buster/prod/jdk8/Makefile rename to epicmorg/prod/jdk8/Makefile diff --git a/epicmorg/debian/buster/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile similarity index 100% rename from epicmorg/debian/buster/prod/main/Dockerfile rename to epicmorg/prod/main/Dockerfile diff --git a/epicmorg/debian/buster/prod/main/Makefile b/epicmorg/prod/main/Makefile similarity index 100% rename from epicmorg/debian/buster/prod/main/Makefile rename to epicmorg/prod/main/Makefile diff --git a/epicmorg/debian/buster/prod/main/deb-multimedia-keyring.gpg b/epicmorg/prod/main/deb-multimedia-keyring.gpg similarity index 100% rename from epicmorg/debian/buster/prod/main/deb-multimedia-keyring.gpg rename to epicmorg/prod/main/deb-multimedia-keyring.gpg diff --git a/epicmorg/debian/buster/prod/main/locale.gen b/epicmorg/prod/main/locale.gen similarity index 100% rename from epicmorg/debian/buster/prod/main/locale.gen rename to epicmorg/prod/main/locale.gen diff --git a/epicmorg/debian/buster/prod/main/locale.gen.full b/epicmorg/prod/main/locale.gen.full similarity index 100% rename from epicmorg/debian/buster/prod/main/locale.gen.full rename to epicmorg/prod/main/locale.gen.full diff --git a/epicmorg/debian/buster/prod/main/sources.list b/epicmorg/prod/main/sources.list similarity index 100% rename from epicmorg/debian/buster/prod/main/sources.list rename to epicmorg/prod/main/sources.list