bullseye

2024-12-25 14:15:38 +03:00 · 2020-09-04 17:20:28 +03:00 · 2020-09-04 17:20:28 +03:00 · 6aca8c21ab
commit 6aca8c21ab
parent 50e9110bb0
70 changed files with 128 additions and 98 deletions
--- 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
--- 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.
+* `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.
--- a/epicmorg/debian/sid/devel/jdk11/Makefile
+++ b/epicmorg/debian/sid/devel/jdk11/Makefile
@ -1,5 +0,0 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/devel:jdk11 .
-	docker push epicmorg/devel:jdk11
-
--- a/epicmorg/debian/sid/devel/jdk6/Makefile
+++ b/epicmorg/debian/sid/devel/jdk6/Makefile
@ -1,5 +0,0 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/devel:jdk6 .
-	docker push epicmorg/devel:jdk6
-
--- a/epicmorg/debian/sid/devel/jdk7/Makefile
+++ b/epicmorg/debian/sid/devel/jdk7/Makefile
@ -1,5 +0,0 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/devel:jdk7 .
-	docker push epicmorg/devel:jdk7
-
--- a/epicmorg/debian/sid/devel/jdk8/Makefile
+++ b/epicmorg/debian/sid/devel/jdk8/Makefile
@ -1,5 +0,0 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/devel:jdk8 .
-	docker push epicmorg/devel:jdk8
-
--- a/epicmorg/debian/sid/devel/main/Makefile
+++ b/epicmorg/debian/sid/devel/main/Makefile
@ -1,5 +0,0 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/devel .
-	docker push epicmorg/devel
-
--- a/epicmorg/debian/sid/edge/jdk11/Makefile
+++ b/epicmorg/debian/sid/edge/jdk11/Makefile
@ -1,5 +0,0 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/edge:jdk11 .
-	docker push epicmorg/edge:jdk11
-
--- a/epicmorg/debian/sid/edge/jdk6/Makefile
+++ b/epicmorg/debian/sid/edge/jdk6/Makefile
@ -1,5 +0,0 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/edge:jdk6 .
-	docker push epicmorg/edge:jdk6
-
--- a/epicmorg/debian/sid/edge/jdk7/Makefile
+++ b/epicmorg/debian/sid/edge/jdk7/Makefile
@ -1,5 +0,0 @@
-all: emgprod
-emgprod:
-	docker build --compress -t epicmorg/edge:jdk7 .
-	docker push epicmorg/edge:jdk7
-
--- a/epicmorg/debian/sid/edge/jdk8/Makefile
+++ b/epicmorg/debian/sid/edge/jdk8/Makefile
@ -1,5 +0,0 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/edge:jdk8 .
-	docker push epicmorg/edge:jdk8
-
--- a/epicmorg/debian/sid/edge/main/Makefile
+++ b/epicmorg/debian/sid/edge/main/Makefile
@ -1,5 +0,0 @@
-all: emgdev
-emgdev:
-	docker build --compress -t epicmorg/edge .
-	docker push epicmorg/edge
-
--- a/epicmorg/debian/sid/edge/main/sid.sources.list
+++ b/epicmorg/debian/sid/edge/main/sid.sources.list
@ -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
--- a/epicmorg/debian/sid/edge/main/sources.list
+++ b/epicmorg/debian/sid/edge/main/sources.list
@ -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
--- a/epicmorg/debian/sid/edge/jdk11/Dockerfile
+++ b/epicmorg/debian/sid/edge/jdk11/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/devel:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/devel-bullseye/jdk11/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/devel/jdk6/Dockerfile
+++ b/epicmorg/debian/sid/devel/jdk6/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/devel
+FROM epicmorg/devel:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/devel-bullseye/jdk6/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/edge/jdk7/Dockerfile
+++ b/epicmorg/debian/sid/edge/jdk7/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/devel:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/devel-bullseye/jdk7/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/devel/jdk8/Dockerfile
+++ b/epicmorg/debian/sid/devel/jdk8/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/devel
+FROM epicmorg/devel:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/devel-bullseye/jdk8/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/devel/main/Dockerfile
+++ b/epicmorg/debian/sid/devel/main/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/edge:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/devel-bullseye/main/Makefile
+++ 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
+
--- a/epicmorg/debian/bullseye/devel/jdk11/Dockerfile
+++ b/epicmorg/debian/bullseye/devel/jdk11/Dockerfile
--- a/epicmorg/debian/bullseye/devel/jdk11/Makefile
+++ b/epicmorg/debian/bullseye/devel/jdk11/Makefile
--- a/epicmorg/debian/bullseye/devel/jdk6/Dockerfile
+++ b/epicmorg/debian/bullseye/devel/jdk6/Dockerfile
--- a/epicmorg/debian/bullseye/devel/jdk6/Makefile
+++ b/epicmorg/debian/bullseye/devel/jdk6/Makefile
--- a/epicmorg/debian/bullseye/devel/jdk7/Dockerfile
+++ b/epicmorg/debian/bullseye/devel/jdk7/Dockerfile
--- a/epicmorg/debian/bullseye/devel/jdk7/Makefile
+++ b/epicmorg/debian/bullseye/devel/jdk7/Makefile
--- a/epicmorg/debian/bullseye/devel/jdk8/Dockerfile
+++ b/epicmorg/debian/bullseye/devel/jdk8/Dockerfile
--- a/epicmorg/debian/bullseye/devel/jdk8/Makefile
+++ b/epicmorg/debian/bullseye/devel/jdk8/Makefile
--- a/epicmorg/debian/bullseye/devel/main/Dockerfile
+++ b/epicmorg/debian/bullseye/devel/main/Dockerfile
--- a/epicmorg/debian/bullseye/devel/main/Makefile
+++ b/epicmorg/debian/bullseye/devel/main/Makefile
--- a/epicmorg/debian/bullseye/egde/jdk11/Dockerfile
+++ b/epicmorg/debian/bullseye/egde/jdk11/Dockerfile
--- a/epicmorg/debian/bullseye/egde/jdk11/Makefile
+++ b/epicmorg/debian/bullseye/egde/jdk11/Makefile
--- a/epicmorg/debian/bullseye/egde/jdk6/Dockerfile
+++ b/epicmorg/debian/bullseye/egde/jdk6/Dockerfile
--- a/epicmorg/debian/bullseye/egde/jdk6/Makefile
+++ b/epicmorg/debian/bullseye/egde/jdk6/Makefile
--- a/epicmorg/debian/bullseye/egde/jdk7/Dockerfile
+++ b/epicmorg/debian/bullseye/egde/jdk7/Dockerfile
--- a/epicmorg/debian/bullseye/egde/jdk7/Makefile
+++ b/epicmorg/debian/bullseye/egde/jdk7/Makefile
--- a/epicmorg/debian/bullseye/egde/jdk8/Dockerfile
+++ b/epicmorg/debian/bullseye/egde/jdk8/Dockerfile
--- a/epicmorg/debian/bullseye/egde/jdk8/Makefile
+++ b/epicmorg/debian/bullseye/egde/jdk8/Makefile
--- a/epicmorg/debian/bullseye/egde/main/Dockerfile
+++ b/epicmorg/debian/bullseye/egde/main/Dockerfile
--- a/epicmorg/debian/bullseye/egde/main/Makefile
+++ b/epicmorg/debian/bullseye/egde/main/Makefile
--- a/epicmorg/debian/bullseye/egde/main/sid.sources.list
+++ b/epicmorg/debian/bullseye/egde/main/sid.sources.list
--- a/epicmorg/debian/sid/devel/jdk11/Dockerfile
+++ b/epicmorg/debian/sid/devel/jdk11/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/devel
+FROM epicmorg/egde:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/egde-bullseye/jdk11/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/edge/jdk6/Dockerfile
+++ b/epicmorg/debian/sid/edge/jdk6/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/edge:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/egde-bullseye/jdk6/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/devel/jdk7/Dockerfile
+++ b/epicmorg/debian/sid/devel/jdk7/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/devel
+FROM epicmorg/edge:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/egde-bullseye/jdk7/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/edge/jdk8/Dockerfile
+++ b/epicmorg/debian/sid/edge/jdk8/Dockerfile
@ -1,4 +1,4 @@
-FROM epicmorg/edge
+FROM epicmorg/edge:bullseye
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive

--- a/epicmorg/egde-bullseye/jdk8/Makefile
+++ 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
+
--- a/epicmorg/debian/sid/edge/main/Dockerfile
+++ b/epicmorg/debian/sid/edge/main/Dockerfile
--- a/epicmorg/egde-bullseye/main/Makefile
+++ 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
+
--- a/epicmorg/debian/bullseye/egde/main/sources.list
+++ b/epicmorg/debian/bullseye/egde/main/sources.list
--- a/epicmorg/debian/buster/prod/jdk11/Dockerfile
+++ b/epicmorg/debian/buster/prod/jdk11/Dockerfile
--- a/epicmorg/debian/buster/prod/jdk11/Makefile
+++ b/epicmorg/debian/buster/prod/jdk11/Makefile
--- a/epicmorg/debian/buster/prod/jdk6/Dockerfile
+++ b/epicmorg/debian/buster/prod/jdk6/Dockerfile
--- a/epicmorg/debian/buster/prod/jdk6/Makefile
+++ b/epicmorg/debian/buster/prod/jdk6/Makefile
--- a/epicmorg/debian/buster/prod/jdk7/Dockerfile
+++ b/epicmorg/debian/buster/prod/jdk7/Dockerfile
--- a/epicmorg/debian/buster/prod/jdk7/Makefile
+++ b/epicmorg/debian/buster/prod/jdk7/Makefile
--- a/epicmorg/debian/buster/prod/jdk8/Dockerfile
+++ b/epicmorg/debian/buster/prod/jdk8/Dockerfile
--- a/epicmorg/debian/buster/prod/jdk8/Makefile
+++ b/epicmorg/debian/buster/prod/jdk8/Makefile
--- a/epicmorg/debian/buster/prod/main/Dockerfile
+++ b/epicmorg/debian/buster/prod/main/Dockerfile
--- a/epicmorg/debian/buster/prod/main/Makefile
+++ b/epicmorg/debian/buster/prod/main/Makefile
--- a/epicmorg/debian/buster/prod/main/deb-multimedia-keyring.gpg
+++ b/epicmorg/debian/buster/prod/main/deb-multimedia-keyring.gpg
--- a/epicmorg/debian/buster/prod/main/locale.gen
+++ b/epicmorg/debian/buster/prod/main/locale.gen
--- a/epicmorg/debian/buster/prod/main/locale.gen.full
+++ b/epicmorg/debian/buster/prod/main/locale.gen.full
--- a/epicmorg/debian/buster/prod/main/sources.list
+++ b/epicmorg/debian/buster/prod/main/sources.list