From 66f410bceb2bc107d9a378b3290455229581d4cc Mon Sep 17 00:00:00 2001 From: Anatolii Zimovskii Date: Sat, 7 May 2022 01:40:43 +0300 Subject: [PATCH] bookworm --- CHANGELOG.md | 1 + Makefile | 255 ++++++++++-------- linux/ecosystem/epicmorg/README.md | 3 - .../10-buster/slim/etc/apt/sources.list | 4 +- .../debian/11-bullseye/develop/Dockerfile | 2 +- .../11-bullseye/slim/etc/apt/sources.list | 3 - .../12-bookworm/develop}/Dockerfile | 23 +- .../12-bookworm/develop}/Makefile | 0 .../12-bookworm/develop/docker-compose.yml | 6 + .../debian/12-bookworm/jdk11/Dockerfile | 26 ++ .../12-bookworm/jdk11/Dockerfile.adopted} | 16 +- .../12-bookworm/jdk11}/Makefile | 0 .../12-bookworm/jdk11/docker-compose.yml | 12 + .../debian/12-bookworm/jdk12/Dockerfile | 26 ++ .../12-bookworm/jdk12}/Makefile | 0 .../12-bookworm/jdk12/docker-compose.yml | 6 + .../debian/12-bookworm/jdk13/Dockerfile | 26 ++ .../12-bookworm/jdk13}/Makefile | 0 .../12-bookworm/jdk13/docker-compose.yml | 6 + .../debian/12-bookworm/jdk14/Dockerfile | 26 ++ .../12-bookworm/jdk14}/Makefile | 0 .../12-bookworm/jdk14/docker-compose.yml | 6 + .../debian/12-bookworm/jdk15/Dockerfile | 26 ++ .../12-bookworm/jdk15}/Makefile | 0 .../12-bookworm/jdk15/docker-compose.yml | 6 + .../12-bookworm}/jdk16/Dockerfile | 15 +- .../12-bookworm/jdk16}/Makefile | 0 .../12-bookworm/jdk16/docker-compose.yml | 6 + .../debian/12-bookworm/jdk17/Dockerfile | 26 ++ .../12-bookworm/jdk17}/Makefile | 0 .../12-bookworm/jdk17/docker-compose.yml | 6 + .../debian/12-bookworm/jdk18/Dockerfile | 26 ++ .../12-bookworm/jdk18}/Makefile | 0 .../12-bookworm/jdk18/docker-compose.yml | 6 + .../12-bookworm}/jdk6/Dockerfile | 10 +- .../jdk7 => debian/12-bookworm/jdk6}/Makefile | 0 .../12-bookworm/jdk6}/docker-compose.yml | 2 +- .../12-bookworm}/jdk7/Dockerfile | 10 +- .../jdk8 => debian/12-bookworm/jdk7}/Makefile | 0 .../12-bookworm}/jdk7/docker-compose.yml | 2 +- .../12-bookworm}/jdk8/Dockerfile | 18 +- .../12-bookworm/jdk8/Dockerfile.adopted} | 15 +- .../main => debian/12-bookworm/jdk8}/Makefile | 0 .../12-bookworm/jdk8/docker-compose.yml | 11 + .../12-bookworm}/main/Dockerfile | 85 +++--- .../12-bookworm/main}/Makefile | 0 .../12-bookworm/main}/docker-compose.yml | 2 +- .../etc/apt}/sources.list.d/github-cli.list | 0 .../apt/sources.list.d/github_git-lfs.list | 2 + .../debian/12-bookworm/slim/Dockerfile | 60 +++++ .../12-bookworm/slim}/Makefile | 0 .../12-bookworm/slim}/docker-compose.yml | 2 +- .../apt/apt.conf.d/99-no-check-valid-until | 1 + .../12-bookworm/slim/etc/apt/sources.list | 28 ++ .../trusted.gpg.d/deb-multimedia-keyring.gpg | Bin .../githubcli-archive-keyring.gpg | Bin .../12-bookworm/slim}/etc/locale.gen | 0 .../12-bookworm/slim}/etc/locale.gen.full | 2 +- .../ecosystem/epicmorg/devel/jdk16/Dockerfile | 24 -- .../ecosystem/epicmorg/devel/jdk6/Dockerfile | 20 -- .../ecosystem/epicmorg/devel/jdk7/Dockerfile | 20 -- .../epicmorg/devel/jdk8/docker-compose.yml | 6 - .../epicmorg/devel/main/docker-compose.yml | 6 - .../ecosystem/epicmorg/edge/jdk11/Dockerfile | 24 -- .../epicmorg/edge/jdk11/docker-compose.yml | 6 - .../ecosystem/epicmorg/edge/jdk16/Dockerfile | 24 -- .../epicmorg/edge/jdk16/docker-compose.yml | 6 - linux/ecosystem/epicmorg/edge/jdk6/Dockerfile | 20 -- .../epicmorg/edge/jdk6/docker-compose.yml | 6 - .../epicmorg/edge/jdk7/docker-compose.yml | 6 - linux/ecosystem/epicmorg/edge/jdk8/Dockerfile | 21 -- .../epicmorg/edge/jdk8/docker-compose.yml | 6 - linux/ecosystem/epicmorg/edge/main/Dockerfile | 30 --- .../epicmorg/edge/main/docker-compose.yml | 6 - .../main/sources.list.d/github_git-lfs.list | 2 - .../edge/main/sources.list.d/sources.list | 21 -- .../ecosystem/epicmorg/prod/jdk11/Dockerfile | 23 -- .../epicmorg/prod/jdk11/docker-compose.yml | 6 - .../epicmorg/prod/jdk16/docker-compose.yml | 6 - linux/ecosystem/epicmorg/prod/jdk6/Makefile | 19 -- .../epicmorg/prod/jdk6/docker-compose.yml | 6 - linux/ecosystem/epicmorg/prod/jdk7/Dockerfile | 20 -- linux/ecosystem/epicmorg/prod/jdk7/Makefile | 19 -- .../epicmorg/prod/jdk7/docker-compose.yml | 6 - linux/ecosystem/epicmorg/prod/jdk8/Makefile | 19 -- .../epicmorg/prod/jdk8/docker-compose.yml | 6 - linux/ecosystem/epicmorg/prod/main/Makefile | 19 -- .../epicmorg/prod/main/docker-compose.yml | 6 - .../main/sources.list.d/github_git-lfs.list | 2 - .../prod/main/sources.list.d/sources.list | 19 -- 90 files changed, 602 insertions(+), 642 deletions(-) rename linux/ecosystem/epicmorg/{devel/main => debian/12-bookworm/develop}/Dockerfile (90%) rename linux/ecosystem/epicmorg/{devel/jdk11 => debian/12-bookworm/develop}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/develop/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile rename linux/ecosystem/epicmorg/{devel/jdk11/Dockerfile => debian/12-bookworm/jdk11/Dockerfile.adopted} (71%) rename linux/ecosystem/epicmorg/{devel/jdk16 => debian/12-bookworm/jdk11}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile rename linux/ecosystem/epicmorg/{devel/jdk6 => debian/12-bookworm/jdk12}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile rename linux/ecosystem/epicmorg/{devel/jdk7 => debian/12-bookworm/jdk13}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile rename linux/ecosystem/epicmorg/{devel/jdk8 => debian/12-bookworm/jdk14}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile rename linux/ecosystem/epicmorg/{devel/main => debian/12-bookworm/jdk15}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml rename linux/ecosystem/epicmorg/{prod => debian/12-bookworm}/jdk16/Dockerfile (71%) rename linux/ecosystem/epicmorg/{edge/jdk11 => debian/12-bookworm/jdk16}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile rename linux/ecosystem/epicmorg/{edge/jdk16 => debian/12-bookworm/jdk17}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile rename linux/ecosystem/epicmorg/{edge/jdk6 => debian/12-bookworm/jdk18}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml rename linux/ecosystem/epicmorg/{prod => debian/12-bookworm}/jdk6/Dockerfile (81%) rename linux/ecosystem/epicmorg/{edge/jdk7 => debian/12-bookworm/jdk6}/Makefile (100%) rename linux/ecosystem/epicmorg/{devel/jdk11 => debian/12-bookworm/jdk6}/docker-compose.yml (59%) rename linux/ecosystem/epicmorg/{edge => debian/12-bookworm}/jdk7/Dockerfile (81%) rename linux/ecosystem/epicmorg/{edge/jdk8 => debian/12-bookworm/jdk7}/Makefile (100%) rename linux/ecosystem/epicmorg/{devel => debian/12-bookworm}/jdk7/docker-compose.yml (58%) rename linux/ecosystem/epicmorg/{devel => debian/12-bookworm}/jdk8/Dockerfile (58%) rename linux/ecosystem/epicmorg/{prod/jdk8/Dockerfile => debian/12-bookworm/jdk8/Dockerfile.adopted} (67%) rename linux/ecosystem/epicmorg/{edge/main => debian/12-bookworm/jdk8}/Makefile (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml rename linux/ecosystem/epicmorg/{prod => debian/12-bookworm}/main/Dockerfile (81%) rename linux/ecosystem/epicmorg/{prod/jdk11 => debian/12-bookworm/main}/Makefile (100%) rename linux/ecosystem/epicmorg/{devel/jdk6 => debian/12-bookworm/main}/docker-compose.yml (61%) rename linux/ecosystem/epicmorg/{prod/main => debian/12-bookworm/main/etc/apt}/sources.list.d/github-cli.list (100%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/github_git-lfs.list create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile rename linux/ecosystem/epicmorg/{prod/jdk16 => debian/12-bookworm/slim}/Makefile (100%) rename linux/ecosystem/epicmorg/{devel/jdk16 => debian/12-bookworm/slim}/docker-compose.yml (58%) create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/99-no-check-valid-until create mode 100644 linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/sources.list rename linux/ecosystem/epicmorg/{prod/main => debian/12-bookworm/slim/etc/apt}/trusted.gpg.d/deb-multimedia-keyring.gpg (100%) rename linux/ecosystem/epicmorg/{prod/main => debian/12-bookworm/slim/etc/apt}/trusted.gpg.d/githubcli-archive-keyring.gpg (100%) rename linux/ecosystem/epicmorg/{prod/main => debian/12-bookworm/slim}/etc/locale.gen (100%) rename linux/ecosystem/epicmorg/{prod/main => debian/12-bookworm/slim}/etc/locale.gen.full (99%) delete mode 100644 linux/ecosystem/epicmorg/devel/jdk16/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/devel/jdk6/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/devel/jdk7/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/devel/jdk8/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/devel/main/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/edge/jdk11/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/edge/jdk11/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/edge/jdk16/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/edge/jdk16/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/edge/jdk6/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/edge/jdk6/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/edge/jdk7/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/edge/jdk8/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/edge/jdk8/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/edge/main/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/edge/main/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/edge/main/sources.list.d/github_git-lfs.list delete mode 100644 linux/ecosystem/epicmorg/edge/main/sources.list.d/sources.list delete mode 100644 linux/ecosystem/epicmorg/prod/jdk11/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/prod/jdk11/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/prod/jdk16/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/prod/jdk6/Makefile delete mode 100644 linux/ecosystem/epicmorg/prod/jdk6/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/prod/jdk7/Dockerfile delete mode 100644 linux/ecosystem/epicmorg/prod/jdk7/Makefile delete mode 100644 linux/ecosystem/epicmorg/prod/jdk7/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/prod/jdk8/Makefile delete mode 100644 linux/ecosystem/epicmorg/prod/jdk8/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/prod/main/Makefile delete mode 100644 linux/ecosystem/epicmorg/prod/main/docker-compose.yml delete mode 100644 linux/ecosystem/epicmorg/prod/main/sources.list.d/github_git-lfs.list delete mode 100644 linux/ecosystem/epicmorg/prod/main/sources.list.d/sources.list diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d624af4b..ae6fd84fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## Changelog ### 2022 +* `april, may` - :x: `BREAKING CHANGES` :x: - deprecating `epicmorg/prod`, `epicmorg/edge`, `epicmorg/develop` iamges. * `february, march` * new `nextcloud` images, updated `atlassian` images. * new `nodejs` iamges. diff --git a/Makefile b/Makefile index 9ab6a2a22..4a7da1bfc 100644 --- a/Makefile +++ b/Makefile @@ -122,138 +122,173 @@ ecosystem-images: ecosystem-debian-images: make ecosystem-debian-jessie-images make ecosystem-debian-stretch-images + make ecosystem-debian-buster-images + make ecosystem-debian-bullseye-images + make ecosystem-debian-bookworm-images ecosystem-debian-jessie-images: - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/slim && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/main && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk6 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk7 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk8 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk11 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk12 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk13 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk14 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk15 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk16 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk17 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk18 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/develop && pwd && make + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/slim && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/main && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk7 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk8 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/jdk18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/08-jessie/develop && pwd && make build && make deploy ecosystem-debian-stretch-images: - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/slim && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/main && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk6 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk7 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk8 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk11 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk12 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk13 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk14 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk15 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk16 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk17 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk18 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/develop && pwd && make + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/slim && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/main && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk7 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk8 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/jdk18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/09-stretch/develop && pwd && make build && make deploy ecosystem-debian-buster-images: - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/slim && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/main && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk6 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk7 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk8 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk11 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk12 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk13 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk14 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk15 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk16 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk17 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk18 && pwd && make - cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/develop && pwd && make + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/slim && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/main && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk7 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk8 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/jdk18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/10-buster/develop && pwd && make build && make deploy + +ecosystem-debian-bullseye-images: + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/slim && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/main && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk7 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk8 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/jdk18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/develop && pwd && make build && make deploy + +ecosystem-debian-bookworm-images: + cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/slim && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/main && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6 && pwd && make build && make deploy + 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/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 + cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/develop && pwd && make build && make deploy ecosystem-php-images: - cd `pwd`/linux/ecosystem/php/latest && pwd && make - cd `pwd`/linux/ecosystem/php/php7.2 && pwd && make - cd `pwd`/linux/ecosystem/php/php7.3 && pwd && make - cd `pwd`/linux/ecosystem/php/php7.4 && pwd && make - cd `pwd`/linux/ecosystem/php/php8.0 && pwd && make + cd `pwd`/linux/ecosystem/php/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/php/php7.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/php/php7.3 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/php/php7.4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/php/php8.0 && pwd && make build && make deploy ecosystem-apache2-images: - cd `pwd`/linux/ecosystem/apache2/latest && pwd && make - cd `pwd`/linux/ecosystem/apache2/php7.2 && pwd && make - cd `pwd`/linux/ecosystem/apache2/php7.3 && pwd && make - cd `pwd`/linux/ecosystem/apache2/php7.4 && pwd && make - cd `pwd`/linux/ecosystem/apache2/php8.0 && pwd && make + cd `pwd`/linux/ecosystem/apache2/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/apache2/php7.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/apache2/php7.3 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/apache2/php7.4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/apache2/php8.0 && pwd && make build && make deploy ecosystem-testrail-images: - cd `pwd`/linux/ecosystem/testrail/latest && pwd && make - cd `pwd`/linux/ecosystem/testrail/ad && pwd && make - cd `pwd`/linux/ecosystem/testrail/ldap && pwd && make + cd `pwd`/linux/ecosystem/testrail/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/testrail/ad && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/testrail/ldap && pwd && make build && make deploy ecosystem-torrserver-images: - cd `pwd`/linux/ecosystem/torrserver && pwd && make + cd `pwd`/linux/ecosystem/torrserver && pwd && make build && make deploy ecosystem-electron-release-server-images: - cd `pwd`/linux/ecosystem/electron-release-server && pwd && make + cd `pwd`/linux/ecosystem/electron-release-server && pwd && make build && make deploy ecosystem-nodejs-images: - cd `pwd`/linux/ecosystem/nodejs/current && pwd && make - cd `pwd`/linux/ecosystem/nodejs/lts && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node10 && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node11 && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node12 && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node13 && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node14 && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node15 && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node16 && pwd && make - cd `pwd`/linux/ecosystem/nodejs/node17 && pwd && make + cd `pwd`/linux/ecosystem/nodejs/current && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/lts && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node10 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nodejs/node17 && pwd && make build && make deploy ecosystem-vk2discord-images: - cd `pwd`/linux/ecosystem/vk2discord && pwd && make + cd `pwd`/linux/ecosystem/vk2discord && pwd && make build && make deploy ecosystem-qbittorrent-images: - cd `pwd`/linux/ecosystem/qbittorrent/latest && pwd && make - cd `pwd`/linux/ecosystem/qbittorrent/stable && pwd && make + cd `pwd`/linux/ecosystem/qbittorrent/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/qbittorrent/stable && pwd && make build && make deploy ecosystem-postgres-images: - cd `pwd`/linux/ecosystem/postgres/latest && pwd && make - cd `pwd`/linux/ecosystem/postgres/8.2 && pwd && make - cd `pwd`/linux/ecosystem/postgres/8.3 && pwd && make - cd `pwd`/linux/ecosystem/postgres/8.4 && pwd && make - cd `pwd`/linux/ecosystem/postgres/9.0 && pwd && make - cd `pwd`/linux/ecosystem/postgres/9.1 && pwd && make - cd `pwd`/linux/ecosystem/postgres/9.2 && pwd && make - cd `pwd`/linux/ecosystem/postgres/9.3 && pwd && make - cd `pwd`/linux/ecosystem/postgres/9.4 && pwd && make - cd `pwd`/linux/ecosystem/postgres/9.5 && pwd && make - cd `pwd`/linux/ecosystem/postgres/9.6 && pwd && make - cd `pwd`/linux/ecosystem/postgres/10 && pwd && make - cd `pwd`/linux/ecosystem/postgres/11 && pwd && make - cd `pwd`/linux/ecosystem/postgres/12 && pwd && make - cd `pwd`/linux/ecosystem/postgres/13 && pwd && make - cd `pwd`/linux/ecosystem/postgres/14 && pwd && make + cd `pwd`/linux/ecosystem/postgres/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/8.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/8.3 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/8.4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/9.0 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/9.1 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/9.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/9.3 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/9.4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/9.5 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/9.6 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/10 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/11 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/13 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/postgres/14 && pwd && make build && make deploy ecosystem-teamcity-agent-images: - cd `pwd`/linux/ecosystem/teamcity/agent/latest && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/amxx-sdk && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/android-sdk && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/atlassian-sdk && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/dotnet-sdk && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/node12 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/node14 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/node15 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/node16 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/node17 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/php7.2 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/php7.3 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/php7.4 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/php8.0 && pwd && make - cd `pwd`/linux/ecosystem/teamcity/agent/steam-sdk && pwd && make + cd `pwd`/linux/ecosystem/teamcity/agent/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/amxx-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/android-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/atlassian-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/dotnet-sdk && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node12 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node14 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node15 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node16 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/node17 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php7.2 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php7.3 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php7.4 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/php8.0 && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/teamcity/agent/steam-sdk && pwd && make build && make deploy ecosystem-nginx-images: - cd `pwd`/linux/ecosystem/nginx/latest/main && pwd && make - cd `pwd`/linux/ecosystem/nginx/latest/php && pwd && make - cd `pwd`/linux/ecosystem/nginx/latest/rtmp-hls && pwd && make + cd `pwd`/linux/ecosystem/nginx/latest/main && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nginx/latest/php && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/nginx/latest/rtmp-hls && pwd && make build && make deploy ecosystem-vscode-server-images: cd `pwd`/linux/advanced/vscode-server/latest && pwd && make build && make deploy @@ -285,12 +320,12 @@ bundle-atlassian: @echo "=======================================" @echo "===== Building Atlassian images =====" @echo "=======================================" - cd `pwd`/linux/ecosystem/atlassian/bitbucket/latest && pwd && make - cd `pwd`/linux/ecosystem/atlassian/confluence/latest && pwd && make - cd `pwd`/linux/ecosystem/atlassian/crucible/latest && pwd && make - cd `pwd`/linux/ecosystem/atlassian/fisheye/latest && pwd && make - cd `pwd`/linux/ecosystem/atlassian/fisheye-crucible/latest && pwd && make - cd `pwd`/linux/ecosystem/atlassian/jira/latest && pwd && make + cd `pwd`/linux/ecosystem/atlassian/bitbucket/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/confluence/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/crucible/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/fisheye/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/fisheye-crucible/latest && pwd && make build && make deploy + cd `pwd`/linux/ecosystem/atlassian/jira/latest && pwd && make build && make deploy bundle-web: @echo "=======================================" diff --git a/linux/ecosystem/epicmorg/README.md b/linux/ecosystem/epicmorg/README.md index 044c898f1..b35f3165a 100644 --- a/linux/ecosystem/epicmorg/README.md +++ b/linux/ecosystem/epicmorg/README.md @@ -1,5 +1,2 @@ # Difference between images -* `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. diff --git a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list index 3142a4446..ef1ba0092 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/debian/10-buster/slim/etc/apt/sources.list @@ -13,11 +13,11 @@ deb-src http://httpredir.debian.org/debian/ buster-backports-sloppy main contrib deb http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free deb-src http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free - + #security deb http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free deb-src http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free - + ##multimedia #deb http://httpredir.debian.org/debian-multimedia/ buster main non-free #deb-src http://httpredir.debian.org/debian-multimedia/ buster main non-free diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile index 5cb74e9f1..3eddb87f2 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/debian: +FROM epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/sources.list index ef310b697..508f1b71c 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/sources.list +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/slim/etc/apt/sources.list @@ -14,9 +14,6 @@ deb-src http://httpredir.debian.org/debian/ bullseye-backports-sloppy main contr deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free -deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free - #security deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free diff --git a/linux/ecosystem/epicmorg/devel/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile similarity index 90% rename from linux/ecosystem/epicmorg/devel/main/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile index fb32d5a14..5abf3bb41 100644 --- a/linux/ecosystem/epicmorg/devel/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/edge +FROM epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -19,14 +19,13 @@ ARG NINJA_RELEASE_URL=https://api.github.com/repos/ninja-build/ninja/releases/${ RUN mkdir -p ${SRC_DIR} ${EXPORT_DIR} ${PRE_DIR} ################################################################## -# sid sources list +# bookworm sources list ################################################################## -RUN apt update && \ - apt-get autoremove -y && \ - apt dist-upgrade -y +RUN apt-get update && \ + apt-get dist-upgrade -y ################################################################## -# deps +# installing ################################################################## RUN apt-get update && \ apt install -y --allow-unauthenticated --allow-downgrades \ @@ -106,11 +105,11 @@ RUN curl -s ${NINJA_RELEASE_URL} | jq -r ".assets[] | select(.name | test(\"${NI ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt purge policykit-1 -y && \ - apt clean -y && \ - apt autoclean -y && \ +RUN apt-get purge policykit-1 -y && \ + apt-get clean -y && \ + apt-get autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb && \ - rm -rfv /tmp/* + rm -rfv /tmp/* && \ + rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/devel/jdk11/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/devel/jdk11/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/develop/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/docker-compose.yml new file mode 100644 index 000000000..03dcb0695 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-develop" + build: + context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile new file mode 100644 index 000000000..a5a527d58 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile @@ -0,0 +1,26 @@ +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://packages.adoptium.net/artifactory/deb bookworm 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 && \ + mkdir /usr/lib/jvm/temurin-11-jdk-amd64/jre && \ + ln -s /usr/lib/jvm/temurin-11-jdk-amd64/bin/ /usr/lib/jvm/temurin-11-jdk-amd64/jre/bin && \ + ln -s /usr/lib/jvm/temurin-11-jdk-amd64/lib/ /usr/lib/jvm/temurin-11-jdk-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/devel/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.adopted similarity index 71% rename from linux/ecosystem/epicmorg/devel/jdk11/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.adopted index 3c99bceda..90e6c45fd 100644 --- a/linux/ecosystem/epicmorg/devel/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Dockerfile.adopted @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -6,19 +6,21 @@ 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/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + 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 - + ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib && \ + java -version ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +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/devel/jdk16/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/devel/jdk16/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml new file mode 100644 index 000000000..25d07ec42 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk11/docker-compose.yml @@ -0,0 +1,12 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk11" + build: + context: . + app-old: + image: "epicmorg/debian:bookworm-jdk11-adopted" + build: + context: . + dockerfile: ./Dockerfile.adopted + diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile new file mode 100644 index 000000000..d99ac8db1 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Dockerfile @@ -0,0 +1,26 @@ +FROM epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java12 +################################################################## +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-12-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-12-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-12-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/devel/jdk6/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/devel/jdk6/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml new file mode 100644 index 000000000..3cc23068f --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk12/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk12" + build: + context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile new file mode 100644 index 000000000..89a06e584 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Dockerfile @@ -0,0 +1,26 @@ +FROM epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java13 +################################################################## +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-13-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-13-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-13-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/devel/jdk7/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/devel/jdk7/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml new file mode 100644 index 000000000..8a7adae72 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk13/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk13" + build: + context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile new file mode 100644 index 000000000..cd910b90f --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Dockerfile @@ -0,0 +1,26 @@ +FROM epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java14 +################################################################## +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-14-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-14-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-14-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/devel/jdk8/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/devel/jdk8/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml new file mode 100644 index 000000000..a422c279f --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk14/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk14" + build: + context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile new file mode 100644 index 000000000..ca1fb4a94 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Dockerfile @@ -0,0 +1,26 @@ +FROM epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +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 && \ + apt-get update && \ + apt-get autoremove -y && \ + apt-get install -y --allow-unauthenticated adoptopenjdk-15-hotspot && \ + mkdir /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre && \ + ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/jre/bin && \ + ln -s /usr/lib/jvm/adoptopenjdk-15-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-15-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/devel/main/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/devel/main/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml new file mode 100644 index 000000000..d35d21e79 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk15/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk15" + build: + context: . diff --git a/linux/ecosystem/epicmorg/prod/jdk16/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile similarity index 71% rename from linux/ecosystem/epicmorg/prod/jdk16/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile index dbe7f1aaa..68160e22b 100644 --- a/linux/ecosystem/epicmorg/prod/jdk16/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -6,18 +6,21 @@ 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/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + 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-16-hotspot && \ mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \ ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \ - ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib + ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib && \ + java -version ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +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/edge/jdk11/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/edge/jdk11/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml new file mode 100644 index 000000000..95a16b2ee --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk16/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk16" + build: + context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile new file mode 100644 index 000000000..37b449689 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Dockerfile @@ -0,0 +1,26 @@ +FROM epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java17 +################################################################## +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/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 && \ + apt-get update && \ + apt-get autoremove -y && \ + apt-get install -y --allow-unauthenticated temurin-17-jdk && \ + mkdir /usr/lib/jvm/temurin-17-jdk-amd64/jre && \ + ln -s /usr/lib/jvm/temurin-17-jdk-amd64/bin/ /usr/lib/jvm/temurin-17-jdk-amd64/jre/bin && \ + ln -s /usr/lib/jvm/temurin-17-jdk-amd64/lib/ /usr/lib/jvm/temurin-17-jdk-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/edge/jdk16/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/edge/jdk16/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml new file mode 100644 index 000000000..bf6b65eae --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk17/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk17" + build: + context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile new file mode 100644 index 000000000..f5b095015 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Dockerfile @@ -0,0 +1,26 @@ +FROM epicmorg/debian:bookworm +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# installing java16 +################################################################## +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/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 && \ + apt-get update && \ + apt-get autoremove -y && \ + apt-get install -y --allow-unauthenticated temurin-18-jdk && \ + mkdir /usr/lib/jvm/temurin-18-jdk-amd64/jre && \ + ln -s /usr/lib/jvm/temurin-18-jdk-amd64/bin/ /usr/lib/jvm/temurin-18-jdk-amd64/jre/bin && \ + ln -s /usr/lib/jvm/temurin-18-jdk-amd64/lib/ /usr/lib/jvm/temurin-18-jdk-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/edge/jdk6/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/edge/jdk6/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml new file mode 100644 index 000000000..852ad3d7d --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk18/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:bookworm-jdk18" + build: + context: . diff --git a/linux/ecosystem/epicmorg/prod/jdk6/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile similarity index 81% rename from linux/ecosystem/epicmorg/prod/jdk6/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile index b9f68955d..94dcde555 100644 --- a/linux/ecosystem/epicmorg/prod/jdk6/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/debian:buster LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -12,9 +12,11 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad java -version ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +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/edge/jdk7/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/edge/jdk7/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/Makefile diff --git a/linux/ecosystem/epicmorg/devel/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/docker-compose.yml similarity index 59% rename from linux/ecosystem/epicmorg/devel/jdk11/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/docker-compose.yml index c18b88c24..9c936e3ec 100644 --- a/linux/ecosystem/epicmorg/devel/jdk11/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk6/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.9' services: app: - image: "epicmorg/devel:jdk11" + image: "epicmorg/debian:buster-jdk6" build: context: . diff --git a/linux/ecosystem/epicmorg/edge/jdk7/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Dockerfile similarity index 81% rename from linux/ecosystem/epicmorg/edge/jdk7/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Dockerfile index bf4c2dc83..b11cead8e 100644 --- a/linux/ecosystem/epicmorg/edge/jdk7/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/edge +FROM epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -12,9 +12,11 @@ RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key ad java -version ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +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/edge/jdk8/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/edge/jdk8/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/Makefile diff --git a/linux/ecosystem/epicmorg/devel/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/docker-compose.yml similarity index 58% rename from linux/ecosystem/epicmorg/devel/jdk7/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/docker-compose.yml index 05c7ad05f..83b87053f 100644 --- a/linux/ecosystem/epicmorg/devel/jdk7/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk7/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.9' services: app: - image: "epicmorg/devel:jdk7" + image: "epicmorg/debian:bookworm-jdk7" build: context: . diff --git a/linux/ecosystem/epicmorg/devel/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile similarity index 58% rename from linux/ecosystem/epicmorg/devel/jdk8/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile index c8442c274..436bffdf9 100644 --- a/linux/ecosystem/epicmorg/devel/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile @@ -1,21 +1,23 @@ -FROM epicmorg/devel +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/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ +RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/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 && \ apt-get update && \ apt-get autoremove -y && \ - apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot - + apt-get install -y --allow-unauthenticated temurin-8-jdk && \ + java -version ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +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/prod/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.adopted similarity index 67% rename from linux/ecosystem/epicmorg/prod/jdk8/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.adopted index 4a9d951fd..fc2705859 100644 --- a/linux/ecosystem/epicmorg/prod/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Dockerfile.adopted @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/debian:bookworm LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -6,15 +6,18 @@ 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/ buster main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + 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 + apt-get install -y --allow-unauthenticated adoptopenjdk-8-hotspot && \ + java -version ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ +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/edge/main/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/edge/main/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/Makefile diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml new file mode 100644 index 000000000..62bb51801 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/jdk8/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3.9' +services: + app: + image: "epicmorg/debian:byster-jdk8" + build: + context: . + app-old: + image: "epicmorg/debian:bookworm-jdk8-adopted" + build: + context: . + dockerfile: ./Dockerfile.adopted diff --git a/linux/ecosystem/epicmorg/prod/main/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile similarity index 81% rename from linux/ecosystem/epicmorg/prod/main/Dockerfile rename to linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile index 295a14fdd..c1fabc1e1 100644 --- a/linux/ecosystem/epicmorg/prod/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Dockerfile @@ -1,22 +1,7 @@ -FROM debian:buster-slim +FROM epicmorg/debian:bookworm-slim LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive -################################################################## -# buster sources list -################################################################## -COPY trusted.gpg.d/deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg -COPY trusted.gpg.d/githubcli-archive-keyring.gpg /etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg - -RUN rm /etc/apt/sources.list -COPY sources.list.d/sources.list /etc/apt/sources.list - -RUN apt update && apt dist-upgrade -y - -COPY etc/locale.gen /etc/locale.gen - -RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done - ################################################################## # perforce client binary ################################################################## @@ -35,22 +20,20 @@ ENV SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz ENV LZGIT_VERSION=0.31.4 ENV LZGIT_DOWNLOAD_URL=https://github.com/jesseduffield/lazygit/releases/download/v${LZGIT_VERSION}/lazygit_${LZGIT_VERSION}_Linux_x86_64.tar.gz +################################################################## +# update lists +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get update + ################################################################## # installing utils ################################################################## RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ - apt-get update && \ apt-get install -y --allow-unauthenticated \ - apt-transport-https \ - apt-utils \ - aptitude \ - bash \ - binutils \ bzip2 \ - ca-certificates \ cmatrix \ cmatrix-xfont \ - console-cyrillic \ cron \ curl \ clzip \ @@ -73,6 +56,9 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio gzip \ htop \ iftop \ + iotop \ + iperf \ + iperf3 \ iputils-ping \ jq \ kmod \ @@ -85,7 +71,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio lsof \ lynx \ lzma \ - libzip4 \ lzip \ lzop \ mc \ @@ -100,21 +85,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio plzip \ p7zip-full \ p7zip-rar \ - python2.7 \ - python3 \ - python3-pil \ - python3-numpy \ - python3-pip \ - hugin-tools \ rsync \ rar \ screenfetch \ smbclient \ - software-properties-common \ subversion \ - sudo \ telnet \ - tini \ tmux \ tree \ util-linux \ @@ -122,7 +98,34 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio unrar \ xz-utils \ wget \ - zip + zip \ + tini \ + libzip4 + +################################################################## +# installing fs-tools +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated \ + btrfs-progs \ + exfat-utils \ + e2fsprogs \ + f2fs-tools \ + dosfstools \ + hfsutils \ + hfsprogs \ + jfsutils \ + mdadm \ + util-linux \ + cryptsetup \ + lvm2 \ + nilfs-tools \ + ntfs-3g \ + reiser4progs \ + reiserfsprogs \ + udftools \ + xfsprogs \ + xfsdump ################################################################## # git-lfs official binary @@ -130,7 +133,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio #RUN curl -s https://packagecloud.io/github/git-lfs/gpgkey | sudo gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/git-lfs.gpg --import && \ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6B05F25D762E3157 && \ rm -rfv /etc/apt/sources.list.d/github_git-lfs.list -COPY sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list +COPY etc/apt/sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ git \ @@ -141,7 +144,7 @@ RUN apt-get update && \ ################################################################## # gh official binary ################################################################## -COPY sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list +COPY etc/apt/sources.list.d/github-cli.list /etc/apt/sources.list.d/github-cli.list RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ gh && \ @@ -181,11 +184,11 @@ RUN wget -nv --random-wait -c -O /tmp/lazygit.tar.xz ${LZGIT_DOWNLOAD_URL} && \ RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## -# cleaninig up +# cleanup ################################################################## -RUN apt purge policykit-1 -y && \ - apt clean -y && \ - apt autoclean -y && \ +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/prod/jdk11/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/main/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/prod/jdk11/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/main/Makefile diff --git a/linux/ecosystem/epicmorg/devel/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/main/docker-compose.yml similarity index 61% rename from linux/ecosystem/epicmorg/devel/jdk6/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/main/docker-compose.yml index fc8255dba..10c5a49d3 100644 --- a/linux/ecosystem/epicmorg/devel/jdk6/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.9' services: app: - image: "epicmorg/devel:jdk6" + image: "epicmorg/debian:bookworm" build: context: . diff --git a/linux/ecosystem/epicmorg/prod/main/sources.list.d/github-cli.list b/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/github-cli.list similarity index 100% rename from linux/ecosystem/epicmorg/prod/main/sources.list.d/github-cli.list rename to linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/github-cli.list diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/github_git-lfs.list new file mode 100644 index 000000000..bd13068d0 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/main/etc/apt/sources.list.d/github_git-lfs.list @@ -0,0 +1,2 @@ +deb https://packagecloud.io/github/git-lfs/debian/ bookworm main +deb-src https://packagecloud.io/github/git-lfs/debian/ bookworm main diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile new file mode 100644 index 000000000..b97e3b4f9 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Dockerfile @@ -0,0 +1,60 @@ +FROM debian:bookworm-slim +LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# prepare system +################################################################## +RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done + +################################################################## +# sources list +################################################################## +RUN rm -rfv /etc/apt/sources.list +RUN rm -rfv /etc/locale.gen + +COPY etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg +COPY etc/apt/apt.conf.d/99-no-check-valid-until /etc/apt/apt.conf.d/99-no-check-valid-until +COPY etc/apt/sources.list /etc/apt/sources.list +COPY etc/locale.gen.full /etc/locale.gen + +RUN apt-get update && \ + apt-get upgrade -y && \ + apt-get dist-upgrade -y + +################################################################## +# installing utils +################################################################## +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \ + apt-get install -y --allow-unauthenticated \ + apt-transport-https \ + apt-utils \ + gnupg \ + gnupg1 \ + gnupg2 \ + aptitude \ + bash \ + binutils \ + console-cyrillic \ + ca-certificates \ + locales \ + software-properties-common \ + sudo + +RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys +RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys + +################################################################## +# update locales +################################################################## +RUN locale-gen + +################################################################## +# 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/prod/jdk16/Makefile b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/Makefile similarity index 100% rename from linux/ecosystem/epicmorg/prod/jdk16/Makefile rename to linux/ecosystem/epicmorg/debian/12-bookworm/slim/Makefile diff --git a/linux/ecosystem/epicmorg/devel/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/docker-compose.yml similarity index 58% rename from linux/ecosystem/epicmorg/devel/jdk16/docker-compose.yml rename to linux/ecosystem/epicmorg/debian/12-bookworm/slim/docker-compose.yml index d72619833..7ef1e6297 100644 --- a/linux/ecosystem/epicmorg/devel/jdk16/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.9' services: app: - image: "epicmorg/devel:jdk16" + image: "epicmorg/debian:bookworm-slim" build: context: . diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/99-no-check-valid-until b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/99-no-check-valid-until new file mode 100644 index 000000000..4e6d9209d --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/apt.conf.d/99-no-check-valid-until @@ -0,0 +1 @@ +Acquire::Check-Valid-Until no; diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/sources.list b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/sources.list new file mode 100644 index 000000000..942e096b8 --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/sources.list @@ -0,0 +1,28 @@ +#main +deb http://httpredir.debian.org/debian/ bookworm main contrib non-free +deb-src http://httpredir.debian.org/debian/ bookworm main contrib non-free + +deb http://httpredir.debian.org/debian/ bookworm-updates main contrib non-free +deb-src http://httpredir.debian.org/debian/ bookworm-updates main contrib non-free + +deb http://httpredir.debian.org/debian/ bookworm-backports main contrib non-free +deb-src http://httpredir.debian.org/debian/ bookworm-backports main contrib non-free + +#deb http://httpredir.debian.org/debian/ bookworm-backports-sloppy main contrib non-free +#deb-src http://httpredir.debian.org/debian/ bookworm-backports-sloppy main contrib non-free + +deb http://httpredir.debian.org/debian/ bookworm-proposed-updates main contrib non-free +deb-src http://httpredir.debian.org/debian/ bookworm-proposed-updates main contrib non-free + +#security +deb http://httpredir.debian.org/debian-security/ bookworm-security main contrib non-free +deb-src http://httpredir.debian.org/debian-security/ bookworm-security main contrib non-free + +deb http://httpredir.debian.org/debian-security/ bookworm-security/updates main contrib non-free +deb-src http://httpredir.debian.org/debian-security/ bookworm-security/updates main contrib non-free + +##multimedia +#deb http://httpredir.debian.org/debian-multimedia/ bookworm main non-free +#deb-src http://httpredir.debian.org/debian-multimedia/ bookworm main non-free +#deb http://httpredir.debian.org/debian-multimedia/ bookworm-backports main +#deb-src http://httpredir.debian.org/debian-multimedia/ bookworm-backports main diff --git a/linux/ecosystem/epicmorg/prod/main/trusted.gpg.d/deb-multimedia-keyring.gpg b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg similarity index 100% rename from linux/ecosystem/epicmorg/prod/main/trusted.gpg.d/deb-multimedia-keyring.gpg rename to linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg diff --git a/linux/ecosystem/epicmorg/prod/main/trusted.gpg.d/githubcli-archive-keyring.gpg b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg similarity index 100% rename from linux/ecosystem/epicmorg/prod/main/trusted.gpg.d/githubcli-archive-keyring.gpg rename to linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/apt/trusted.gpg.d/githubcli-archive-keyring.gpg diff --git a/linux/ecosystem/epicmorg/prod/main/etc/locale.gen b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/locale.gen similarity index 100% rename from linux/ecosystem/epicmorg/prod/main/etc/locale.gen rename to linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/locale.gen diff --git a/linux/ecosystem/epicmorg/prod/main/etc/locale.gen.full b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/locale.gen.full similarity index 99% rename from linux/ecosystem/epicmorg/prod/main/etc/locale.gen.full rename to linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/locale.gen.full index 602141659..7261c6cb3 100644 --- a/linux/ecosystem/epicmorg/prod/main/etc/locale.gen.full +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/slim/etc/locale.gen.full @@ -399,7 +399,7 @@ sgs_LT UTF-8 shn_MM UTF-8 shs_CA UTF-8 si_LK UTF-8 -sid_ET UTF-8 +bookworm_ET UTF-8 sk_SK.UTF-8 UTF-8 sk_SK ISO-8859-2 sl_SI.UTF-8 UTF-8 diff --git a/linux/ecosystem/epicmorg/devel/jdk16/Dockerfile b/linux/ecosystem/epicmorg/devel/jdk16/Dockerfile deleted file mode 100644 index 18a382df5..000000000 --- a/linux/ecosystem/epicmorg/devel/jdk16/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM epicmorg/devel -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -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/ buster 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 && \ - mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \ - ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \ - ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib - - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/devel/jdk6/Dockerfile b/linux/ecosystem/epicmorg/devel/jdk6/Dockerfile deleted file mode 100644 index 477630f7a..000000000 --- a/linux/ecosystem/epicmorg/devel/jdk6/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/devel -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java6 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-6 && \ - java -version - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/devel/jdk7/Dockerfile b/linux/ecosystem/epicmorg/devel/jdk7/Dockerfile deleted file mode 100644 index 828853acb..000000000 --- a/linux/ecosystem/epicmorg/devel/jdk7/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/devel -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java7 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-7 && \ - java -version - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/devel/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/devel/jdk8/docker-compose.yml deleted file mode 100644 index 82658b37b..000000000 --- a/linux/ecosystem/epicmorg/devel/jdk8/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/devel:jdk8" - build: - context: . diff --git a/linux/ecosystem/epicmorg/devel/main/docker-compose.yml b/linux/ecosystem/epicmorg/devel/main/docker-compose.yml deleted file mode 100644 index d580e7a5d..000000000 --- a/linux/ecosystem/epicmorg/devel/main/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/devel:latest" - build: - context: . diff --git a/linux/ecosystem/epicmorg/edge/jdk11/Dockerfile b/linux/ecosystem/epicmorg/edge/jdk11/Dockerfile deleted file mode 100644 index af321551d..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk11/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM epicmorg/edge -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/ buster 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 - - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/edge/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/edge/jdk11/docker-compose.yml deleted file mode 100644 index 8e3c49f5c..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk11/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/edge:jdk11" - build: - context: . diff --git a/linux/ecosystem/epicmorg/edge/jdk16/Dockerfile b/linux/ecosystem/epicmorg/edge/jdk16/Dockerfile deleted file mode 100644 index 9b8a6ec8b..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk16/Dockerfile +++ /dev/null @@ -1,24 +0,0 @@ -FROM epicmorg/edge -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -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/ buster 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 && \ - mkdir /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre && \ - ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/bin && \ - ln -s /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-16-hotspot-amd64/jre/lib - - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/edge/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/edge/jdk16/docker-compose.yml deleted file mode 100644 index 7945ea454..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk16/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/edge:jdk16" - build: - context: . diff --git a/linux/ecosystem/epicmorg/edge/jdk6/Dockerfile b/linux/ecosystem/epicmorg/edge/jdk6/Dockerfile deleted file mode 100644 index 189601b1f..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk6/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/edge -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java6 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-6 && \ - java -version - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/edge/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/edge/jdk6/docker-compose.yml deleted file mode 100644 index be02b2e6c..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk6/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/edge:jdk6" - build: - context: . diff --git a/linux/ecosystem/epicmorg/edge/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/edge/jdk7/docker-compose.yml deleted file mode 100644 index f28c0e686..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk7/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/edge:jdk7" - build: - context: . diff --git a/linux/ecosystem/epicmorg/edge/jdk8/Dockerfile b/linux/ecosystem/epicmorg/edge/jdk8/Dockerfile deleted file mode 100644 index fc85fe4e5..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk8/Dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM epicmorg/edge -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/ buster 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 - - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/edge/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/edge/jdk8/docker-compose.yml deleted file mode 100644 index 62509c1d6..000000000 --- a/linux/ecosystem/epicmorg/edge/jdk8/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/edge:jdk8" - build: - context: . diff --git a/linux/ecosystem/epicmorg/edge/main/Dockerfile b/linux/ecosystem/epicmorg/edge/main/Dockerfile deleted file mode 100644 index 16b397180..000000000 --- a/linux/ecosystem/epicmorg/edge/main/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM epicmorg/prod -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# git-lfs official binary -################################################################## -RUN rm -rfv /etc/apt/sources.list.d/github_git-lfs.list -COPY sources.list.d/github_git-lfs.list /etc/apt/sources.list.d/github_git-lfs.list - -################################################################## -# bullseye sources list -################################################################## -RUN rm -rfv /etc/apt/sources.list -COPY sources.list.d/sources.list /etc/apt/sources.list -RUN apt update && \ - apt autoremove -y && \ - apt-get install -y libc6 libxml2-utils && \ - apt upgrade -y && \ - apt dist-upgrade -y && \ - apt autoremove -y - -################################################################## -# cleaninig up -################################################################## -RUN apt purge policykit-1 -y && \ - apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/edge/main/docker-compose.yml b/linux/ecosystem/epicmorg/edge/main/docker-compose.yml deleted file mode 100644 index 68eb65396..000000000 --- a/linux/ecosystem/epicmorg/edge/main/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/edge:latest" - build: - context: . diff --git a/linux/ecosystem/epicmorg/edge/main/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/edge/main/sources.list.d/github_git-lfs.list deleted file mode 100644 index 8cf93d426..000000000 --- a/linux/ecosystem/epicmorg/edge/main/sources.list.d/github_git-lfs.list +++ /dev/null @@ -1,2 +0,0 @@ -deb https://packagecloud.io/github/git-lfs/debian/ bullseye main -deb-src https://packagecloud.io/github/git-lfs/debian/ bullseye main diff --git a/linux/ecosystem/epicmorg/edge/main/sources.list.d/sources.list b/linux/ecosystem/epicmorg/edge/main/sources.list.d/sources.list deleted file mode 100644 index 5a8c0081a..000000000 --- a/linux/ecosystem/epicmorg/edge/main/sources.list.d/sources.list +++ /dev/null @@ -1,21 +0,0 @@ -#main -deb http://httpredir.debian.org/debian/ bullseye main contrib non-free -deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free -deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free -deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free -deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free -deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free - -#security -deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free -deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free - -##multimedia -# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free -# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main -# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main diff --git a/linux/ecosystem/epicmorg/prod/jdk11/Dockerfile b/linux/ecosystem/epicmorg/prod/jdk11/Dockerfile deleted file mode 100644 index d0f3001aa..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk11/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM epicmorg/prod -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/ buster 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 - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/prod/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/prod/jdk11/docker-compose.yml deleted file mode 100644 index f2f42c39a..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk11/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/prod:jdk11" - build: - context: . diff --git a/linux/ecosystem/epicmorg/prod/jdk16/docker-compose.yml b/linux/ecosystem/epicmorg/prod/jdk16/docker-compose.yml deleted file mode 100644 index 4d284744c..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk16/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/prod:jdk16" - build: - context: . diff --git a/linux/ecosystem/epicmorg/prod/jdk6/Makefile b/linux/ecosystem/epicmorg/prod/jdk6/Makefile deleted file mode 100644 index bad6d73b5..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk6/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: app - -app: - make build - make deploy - make clean - -build: - docker-compose build --compress --parallel - -deploy: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/ecosystem/epicmorg/prod/jdk6/docker-compose.yml b/linux/ecosystem/epicmorg/prod/jdk6/docker-compose.yml deleted file mode 100644 index d3b32eefa..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk6/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/prod:jdk6" - build: - context: . diff --git a/linux/ecosystem/epicmorg/prod/jdk7/Dockerfile b/linux/ecosystem/epicmorg/prod/jdk7/Dockerfile deleted file mode 100644 index a2dfba358..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk7/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM epicmorg/prod -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# installing java7 -################################################################## -RUN wget -qO - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | apt-key add - && \ - echo 'deb http://repos.azulsystems.com/debian stable main' > /etc/apt/sources.list.d/zulu.list && \ - apt-get update -y && \ - apt-get install -y --allow-unauthenticated zulu-7 && \ - java -version - -################################################################## -# cleaninig up -################################################################## -RUN apt clean -y && \ - apt autoclean -y && \ - rm -rfv /var/lib/apt/lists/* && \ - rm -rfv /var/cache/apt/archives/*.deb diff --git a/linux/ecosystem/epicmorg/prod/jdk7/Makefile b/linux/ecosystem/epicmorg/prod/jdk7/Makefile deleted file mode 100644 index bad6d73b5..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk7/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: app - -app: - make build - make deploy - make clean - -build: - docker-compose build --compress --parallel - -deploy: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/ecosystem/epicmorg/prod/jdk7/docker-compose.yml b/linux/ecosystem/epicmorg/prod/jdk7/docker-compose.yml deleted file mode 100644 index 552f80bde..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk7/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/prod:jdk7" - build: - context: . diff --git a/linux/ecosystem/epicmorg/prod/jdk8/Makefile b/linux/ecosystem/epicmorg/prod/jdk8/Makefile deleted file mode 100644 index bad6d73b5..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk8/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: app - -app: - make build - make deploy - make clean - -build: - docker-compose build --compress --parallel - -deploy: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/ecosystem/epicmorg/prod/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/prod/jdk8/docker-compose.yml deleted file mode 100644 index e1a271d98..000000000 --- a/linux/ecosystem/epicmorg/prod/jdk8/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/prod:jdk8" - build: - context: . diff --git a/linux/ecosystem/epicmorg/prod/main/Makefile b/linux/ecosystem/epicmorg/prod/main/Makefile deleted file mode 100644 index bad6d73b5..000000000 --- a/linux/ecosystem/epicmorg/prod/main/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: app - -app: - make build - make deploy - make clean - -build: - docker-compose build --compress --parallel - -deploy: - docker-compose push - -clean: - docker container prune -f - docker image prune -f - docker network prune -f - docker volume prune -f - docker system prune -af diff --git a/linux/ecosystem/epicmorg/prod/main/docker-compose.yml b/linux/ecosystem/epicmorg/prod/main/docker-compose.yml deleted file mode 100644 index 0eb49ecd4..000000000 --- a/linux/ecosystem/epicmorg/prod/main/docker-compose.yml +++ /dev/null @@ -1,6 +0,0 @@ -version: '3.9' -services: - app: - image: "epicmorg/prod:latest" - build: - context: . diff --git a/linux/ecosystem/epicmorg/prod/main/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/prod/main/sources.list.d/github_git-lfs.list deleted file mode 100644 index 867534422..000000000 --- a/linux/ecosystem/epicmorg/prod/main/sources.list.d/github_git-lfs.list +++ /dev/null @@ -1,2 +0,0 @@ -deb https://packagecloud.io/github/git-lfs/debian/ buster main -deb-src https://packagecloud.io/github/git-lfs/debian/ buster main diff --git a/linux/ecosystem/epicmorg/prod/main/sources.list.d/sources.list b/linux/ecosystem/epicmorg/prod/main/sources.list.d/sources.list deleted file mode 100644 index 412c35d1a..000000000 --- a/linux/ecosystem/epicmorg/prod/main/sources.list.d/sources.list +++ /dev/null @@ -1,19 +0,0 @@ -#main -deb http://httpredir.debian.org/debian/ buster main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster main contrib non-free -deb http://httpredir.debian.org/debian/ buster-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster-updates main contrib non-free -deb http://httpredir.debian.org/debian/ buster-backports main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster-backports main contrib non-free -deb http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free -deb-src http://httpredir.debian.org/debian/ buster-proposed-updates main contrib non-free - -#security -deb http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free -deb-src http://httpredir.debian.org/debian-security/ buster/updates main contrib non-free - -##multimedia -#deb http://httpredir.debian.org/debian-multimedia/ buster main non-free -#deb-src http://httpredir.debian.org/debian-multimedia/ buster main non-free -#deb http://httpredir.debian.org/debian-multimedia/ buster-backports main -#deb-src http://httpredir.debian.org/debian-multimedia/ buster-backports main