From 5adc59318077ce7b67b61e61373d8e772489be96 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Jan 2020 19:08:38 +0300 Subject: [PATCH] separated base containers to pure,jdk8 and jdk11 --- .travis.yml | 32 +- .../devel/{ => jdk11}/.docker-repository.yml | 0 epicmorg/devel/{ => jdk11}/.dockerignore | 0 epicmorg/devel/jdk11/Dockerfile | 23 + epicmorg/devel/jdk11/Makefile | 5 + epicmorg/devel/jdk8/.docker-repository.yml | 1 + .../{prod-jdk8 => devel/jdk8}/.dockerignore | 0 epicmorg/devel/jdk8/Dockerfile | 20 + epicmorg/devel/jdk8/Makefile | 5 + epicmorg/devel/main/.docker-repository.yml | 1 + epicmorg/{prod => devel/main}/.dockerignore | 0 epicmorg/devel/{ => main}/Dockerfile | 0 epicmorg/devel/{ => main}/Makefile | 0 epicmorg/devel/{ => main}/sources.list | 0 epicmorg/prod/Dockerfile | 85 --- epicmorg/prod/Makefile | 5 - epicmorg/prod/deb-multimedia-keyring.gpg | Bin 7607 -> 0 bytes .../jdk11}/.docker-repository.yml | 0 epicmorg/prod/jdk11/.dockerignore | 3 + epicmorg/prod/jdk11/Dockerfile | 22 + epicmorg/prod/jdk11/Makefile | 5 + .../prod/{ => jdk8}/.docker-repository.yml | 0 epicmorg/prod/jdk8/.dockerignore | 3 + epicmorg/prod/jdk8/Dockerfile | 19 + epicmorg/prod/jdk8/Makefile | 5 + epicmorg/prod/locale.gen | 12 - epicmorg/prod/locale.gen.full | 496 ------------------ epicmorg/prod/main/.docker-repository.yml | 1 + epicmorg/prod/main/.dockerignore | 3 + epicmorg/{prod-jdk8 => prod/main}/Dockerfile | 16 - epicmorg/{prod-jdk8 => prod/main}/Makefile | 0 .../main}/deb-multimedia-keyring.gpg | Bin epicmorg/{prod-jdk8 => prod/main}/locale.gen | 0 .../{prod-jdk8 => prod/main}/locale.gen.full | 0 .../{prod-jdk8 => prod/main}/sources.list | 0 epicmorg/prod/sources.list | 17 - teamcity-agent/Dockerfile | 2 +- 37 files changed, 148 insertions(+), 633 deletions(-) rename epicmorg/devel/{ => jdk11}/.docker-repository.yml (100%) rename epicmorg/devel/{ => jdk11}/.dockerignore (100%) create mode 100644 epicmorg/devel/jdk11/Dockerfile create mode 100644 epicmorg/devel/jdk11/Makefile create mode 100644 epicmorg/devel/jdk8/.docker-repository.yml rename epicmorg/{prod-jdk8 => devel/jdk8}/.dockerignore (100%) create mode 100644 epicmorg/devel/jdk8/Dockerfile create mode 100644 epicmorg/devel/jdk8/Makefile create mode 100644 epicmorg/devel/main/.docker-repository.yml rename epicmorg/{prod => devel/main}/.dockerignore (100%) rename epicmorg/devel/{ => main}/Dockerfile (100%) rename epicmorg/devel/{ => main}/Makefile (100%) rename epicmorg/devel/{ => main}/sources.list (100%) delete mode 100644 epicmorg/prod/Dockerfile delete mode 100644 epicmorg/prod/Makefile delete mode 100644 epicmorg/prod/deb-multimedia-keyring.gpg rename epicmorg/{prod-jdk8 => prod/jdk11}/.docker-repository.yml (100%) create mode 100644 epicmorg/prod/jdk11/.dockerignore create mode 100644 epicmorg/prod/jdk11/Dockerfile create mode 100644 epicmorg/prod/jdk11/Makefile rename epicmorg/prod/{ => jdk8}/.docker-repository.yml (100%) create mode 100644 epicmorg/prod/jdk8/.dockerignore create mode 100644 epicmorg/prod/jdk8/Dockerfile create mode 100644 epicmorg/prod/jdk8/Makefile delete mode 100644 epicmorg/prod/locale.gen delete mode 100644 epicmorg/prod/locale.gen.full create mode 100644 epicmorg/prod/main/.docker-repository.yml create mode 100644 epicmorg/prod/main/.dockerignore rename epicmorg/{prod-jdk8 => prod/main}/Dockerfile (61%) rename epicmorg/{prod-jdk8 => prod/main}/Makefile (100%) rename epicmorg/{prod-jdk8 => prod/main}/deb-multimedia-keyring.gpg (100%) rename epicmorg/{prod-jdk8 => prod/main}/locale.gen (100%) rename epicmorg/{prod-jdk8 => prod/main}/locale.gen.full (100%) rename epicmorg/{prod-jdk8 => prod/main}/sources.list (100%) delete mode 100644 epicmorg/prod/sources.list diff --git a/.travis.yml b/.travis.yml index fe859382a..a8296e214 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,18 +46,48 @@ matrix: #### Our High priority images ######################################### +# - name: Template +# script: +# - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin +# - docker build --compress -t user/repo:tag path/to/folder/contains/dockerfile +# - docker push user/repo:tag + - name: Base Production script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - - docker build --compress -t epicmorg/prod:latest epicmorg/prod + - docker build --compress -t epicmorg/prod:latest epicmorg/prod/main - docker push epicmorg/prod:latest + - name: Base Production + JDK 8 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/prod:jdk8 epicmorg/prod/jdk8 + - docker push epicmorg/prod:jdk8 + + - name: Base Production + JDK 11 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/prod:jdk11 epicmorg/prod/jdk11 + - docker push epicmorg/prod:jdk11 + - name: Base Develop script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - docker build --compress -t epicmorg/devel:latest epicmorg/devel - docker push epicmorg/devel:latest + - name: Base Develop + JDK 8 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk8 epicmorg/devel/jdk8 + - docker push epicmorg/devel:jdk8 + + - name: Base Develop + JDK 11 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/devel:jdk11 epicmorg/devel/jdk11 + - docker push epicmorg/devel:jdk11 + - name: TeamCity Agent script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin diff --git a/epicmorg/devel/.docker-repository.yml b/epicmorg/devel/jdk11/.docker-repository.yml similarity index 100% rename from epicmorg/devel/.docker-repository.yml rename to epicmorg/devel/jdk11/.docker-repository.yml diff --git a/epicmorg/devel/.dockerignore b/epicmorg/devel/jdk11/.dockerignore similarity index 100% rename from epicmorg/devel/.dockerignore rename to epicmorg/devel/jdk11/.dockerignore diff --git a/epicmorg/devel/jdk11/Dockerfile b/epicmorg/devel/jdk11/Dockerfile new file mode 100644 index 000000000..e97bdf420 --- /dev/null +++ b/epicmorg/devel/jdk11/Dockerfile @@ -0,0 +1,23 @@ +FROM epicmorg/devel +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 | sudo 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 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/epicmorg/devel/jdk11/Makefile b/epicmorg/devel/jdk11/Makefile new file mode 100644 index 000000000..62e0280e0 --- /dev/null +++ b/epicmorg/devel/jdk11/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/devel:jdk11 . + docker push epicmorg/devel:jdk11 + diff --git a/epicmorg/devel/jdk8/.docker-repository.yml b/epicmorg/devel/jdk8/.docker-repository.yml new file mode 100644 index 000000000..9ab554e4d --- /dev/null +++ b/epicmorg/devel/jdk8/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/devel diff --git a/epicmorg/prod-jdk8/.dockerignore b/epicmorg/devel/jdk8/.dockerignore similarity index 100% rename from epicmorg/prod-jdk8/.dockerignore rename to epicmorg/devel/jdk8/.dockerignore diff --git a/epicmorg/devel/jdk8/Dockerfile b/epicmorg/devel/jdk8/Dockerfile new file mode 100644 index 000000000..a9cf2ba58 --- /dev/null +++ b/epicmorg/devel/jdk8/Dockerfile @@ -0,0 +1,20 @@ +FROM epicmorg/devel +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 | sudo 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 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/epicmorg/devel/jdk8/Makefile b/epicmorg/devel/jdk8/Makefile new file mode 100644 index 000000000..17f27ca0e --- /dev/null +++ b/epicmorg/devel/jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgdev +emgdev: + docker build --compress -t epicmorg/devel:jdk8 . + docker push epicmorg/devel:jdk8 + diff --git a/epicmorg/devel/main/.docker-repository.yml b/epicmorg/devel/main/.docker-repository.yml new file mode 100644 index 000000000..9ab554e4d --- /dev/null +++ b/epicmorg/devel/main/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/devel diff --git a/epicmorg/prod/.dockerignore b/epicmorg/devel/main/.dockerignore similarity index 100% rename from epicmorg/prod/.dockerignore rename to epicmorg/devel/main/.dockerignore diff --git a/epicmorg/devel/Dockerfile b/epicmorg/devel/main/Dockerfile similarity index 100% rename from epicmorg/devel/Dockerfile rename to epicmorg/devel/main/Dockerfile diff --git a/epicmorg/devel/Makefile b/epicmorg/devel/main/Makefile similarity index 100% rename from epicmorg/devel/Makefile rename to epicmorg/devel/main/Makefile diff --git a/epicmorg/devel/sources.list b/epicmorg/devel/main/sources.list similarity index 100% rename from epicmorg/devel/sources.list rename to epicmorg/devel/main/sources.list diff --git a/epicmorg/prod/Dockerfile b/epicmorg/prod/Dockerfile deleted file mode 100644 index a9c4bef17..000000000 --- a/epicmorg/prod/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -FROM debian:buster -LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" -ARG DEBIAN_FRONTEND=noninteractive - -################################################################## -# buster sources list -################################################################## -COPY deb-multimedia-keyring.gpg /etc/apt/trusted.gpg.d/deb-multimedia-keyring.gpg -RUN rm /etc/apt/sources.list -COPY sources.list /etc/apt/sources.list -RUN apt update && apt dist-upgrade -y -COPY locale.gen /etc/locale.gen - -################################################################## -# 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 \ - bash \ - ca-certificates \ - cmatrix \ - cmatrix-xfont \ - console-cyrillic \ - curl \ - ffmpeg \ - fontconfig \ - git \ - gnupg \ - gnupg2 \ - graphicsmagick \ - htop \ - iftop \ - iputils-ping \ - kmod \ - libzip4 \ - locales \ - lsb-release \ - lsof \ - lynx \ - mc \ - nano \ - nmap \ - openssl \ - perl \ - procps \ - rsync \ - screenfetch \ - smbclient \ - sudo \ - telnet \ - tini \ - tmux \ - tree \ - ttf-dejavu \ - util-linux \ - uuid-runtime \ - wget \ - zip - -################################################################## -# installing java8 -################################################################## -#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \ -# echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list && \ -# apt-get update && \ -# apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - -RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo 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 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/epicmorg/prod/Makefile b/epicmorg/prod/Makefile deleted file mode 100644 index 9c6cb3e47..000000000 --- a/epicmorg/prod/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -all: emgprod -emgprod: - docker build --compress -t epicmorg/prod . - docker push epicmorg/prod - diff --git a/epicmorg/prod/deb-multimedia-keyring.gpg b/epicmorg/prod/deb-multimedia-keyring.gpg deleted file mode 100644 index a4f2b1006e8a1c556adb8801ed5ac01fc4124d96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7607 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 /etc/apt/sources.list.d/adoptopenjdk-official.list && \ + apt-get update && \ + 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/epicmorg/prod/jdk11/Makefile b/epicmorg/prod/jdk11/Makefile new file mode 100644 index 000000000..0e1191be5 --- /dev/null +++ b/epicmorg/prod/jdk11/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/prod:jdk11 . + docker push epicmorg/prod:jdk11 + diff --git a/epicmorg/prod/.docker-repository.yml b/epicmorg/prod/jdk8/.docker-repository.yml similarity index 100% rename from epicmorg/prod/.docker-repository.yml rename to epicmorg/prod/jdk8/.docker-repository.yml diff --git a/epicmorg/prod/jdk8/.dockerignore b/epicmorg/prod/jdk8/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/prod/jdk8/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/prod/jdk8/Dockerfile b/epicmorg/prod/jdk8/Dockerfile new file mode 100644 index 000000000..4d5d8c7b4 --- /dev/null +++ b/epicmorg/prod/jdk8/Dockerfile @@ -0,0 +1,19 @@ +FROM epicmorg/prod +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 | sudo 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 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/epicmorg/prod/jdk8/Makefile b/epicmorg/prod/jdk8/Makefile new file mode 100644 index 000000000..7ee8c155f --- /dev/null +++ b/epicmorg/prod/jdk8/Makefile @@ -0,0 +1,5 @@ +all: emgprod +emgprod: + docker build --compress -t epicmorg/prod:jdk8 . + docker push epicmorg/prod:jdk8 + diff --git a/epicmorg/prod/locale.gen b/epicmorg/prod/locale.gen deleted file mode 100644 index 02f100afa..000000000 --- a/epicmorg/prod/locale.gen +++ /dev/null @@ -1,12 +0,0 @@ -en_GB.UTF-8 UTF-8 -en_GB ISO-8859-1 -en_GB.ISO-8859-15 ISO-8859-15 -en_US.UTF-8 UTF-8 -en_US ISO-8859-1 -en_US.ISO-8859-15 ISO-8859-15 -ru_RU.UTF-8 UTF-8 -ru_RU.KOI8-R KOI8-R -ru_RU ISO-8859-5 -ru_RU.CP1251 CP1251 -ru_UA.UTF-8 UTF-8 -ru_UA KOI8-U diff --git a/epicmorg/prod/locale.gen.full b/epicmorg/prod/locale.gen.full deleted file mode 100644 index 602141659..000000000 --- a/epicmorg/prod/locale.gen.full +++ /dev/null @@ -1,496 +0,0 @@ -aa_DJ.UTF-8 UTF-8 -aa_DJ ISO-8859-1 -aa_ER UTF-8 -aa_ER@saaho UTF-8 -aa_ET UTF-8 -af_ZA.UTF-8 UTF-8 -af_ZA ISO-8859-1 -agr_PE UTF-8 -ak_GH UTF-8 -am_ET UTF-8 -an_ES.UTF-8 UTF-8 -an_ES ISO-8859-15 -anp_IN UTF-8 -ar_AE.UTF-8 UTF-8 -ar_AE ISO-8859-6 -ar_BH.UTF-8 UTF-8 -ar_BH ISO-8859-6 -ar_DZ.UTF-8 UTF-8 -ar_DZ ISO-8859-6 -ar_EG.UTF-8 UTF-8 -ar_EG ISO-8859-6 -ar_IN UTF-8 -ar_IQ.UTF-8 UTF-8 -ar_IQ ISO-8859-6 -ar_JO.UTF-8 UTF-8 -ar_JO ISO-8859-6 -ar_KW.UTF-8 UTF-8 -ar_KW ISO-8859-6 -ar_LB.UTF-8 UTF-8 -ar_LB ISO-8859-6 -ar_LY.UTF-8 UTF-8 -ar_LY ISO-8859-6 -ar_MA.UTF-8 UTF-8 -ar_MA ISO-8859-6 -ar_OM.UTF-8 UTF-8 -ar_OM ISO-8859-6 -ar_QA.UTF-8 UTF-8 -ar_QA ISO-8859-6 -ar_SA.UTF-8 UTF-8 -ar_SA ISO-8859-6 -ar_SD.UTF-8 UTF-8 -ar_SD ISO-8859-6 -ar_SS UTF-8 -ar_SY.UTF-8 UTF-8 -ar_SY ISO-8859-6 -ar_TN.UTF-8 UTF-8 -ar_TN ISO-8859-6 -ar_YE.UTF-8 UTF-8 -ar_YE ISO-8859-6 -ayc_PE UTF-8 -az_AZ UTF-8 -az_IR UTF-8 -as_IN UTF-8 -ast_ES.UTF-8 UTF-8 -ast_ES ISO-8859-15 -be_BY.UTF-8 UTF-8 -be_BY CP1251 -be_BY@latin UTF-8 -bem_ZM UTF-8 -ber_DZ UTF-8 -ber_MA UTF-8 -bg_BG.UTF-8 UTF-8 -bg_BG CP1251 -bhb_IN.UTF-8 UTF-8 -bho_IN UTF-8 -bho_NP UTF-8 -bi_VU UTF-8 -bn_BD UTF-8 -bn_IN UTF-8 -bo_CN UTF-8 -bo_IN UTF-8 -br_FR.UTF-8 UTF-8 -br_FR ISO-8859-1 -br_FR@euro ISO-8859-15 -brx_IN UTF-8 -bs_BA.UTF-8 UTF-8 -bs_BA ISO-8859-2 -byn_ER UTF-8 -ca_AD.UTF-8 UTF-8 -ca_AD ISO-8859-15 -ca_ES.UTF-8 UTF-8 -ca_ES ISO-8859-1 -ca_ES@euro ISO-8859-15 -ca_ES@valencia UTF-8 -ca_FR.UTF-8 UTF-8 -ca_FR ISO-8859-15 -ca_IT.UTF-8 UTF-8 -ca_IT ISO-8859-15 -ce_RU UTF-8 -chr_US UTF-8 -cmn_TW UTF-8 -crh_UA UTF-8 -cs_CZ.UTF-8 UTF-8 -cs_CZ ISO-8859-2 -csb_PL UTF-8 -cv_RU UTF-8 -cy_GB.UTF-8 UTF-8 -cy_GB ISO-8859-14 -da_DK.UTF-8 UTF-8 -da_DK ISO-8859-1 -de_AT.UTF-8 UTF-8 -de_AT ISO-8859-1 -de_AT@euro ISO-8859-15 -de_BE.UTF-8 UTF-8 -de_BE ISO-8859-1 -de_BE@euro ISO-8859-15 -de_CH.UTF-8 UTF-8 -de_CH ISO-8859-1 -de_DE.UTF-8 UTF-8 -de_DE ISO-8859-1 -de_DE@euro ISO-8859-15 -de_IT.UTF-8 UTF-8 -de_IT ISO-8859-1 -de_LI.UTF-8 UTF-8 -de_LU.UTF-8 UTF-8 -de_LU ISO-8859-1 -de_LU@euro ISO-8859-15 -doi_IN UTF-8 -dsb_DE UTF-8 -dv_MV UTF-8 -dz_BT UTF-8 -el_GR.UTF-8 UTF-8 -el_GR ISO-8859-7 -el_GR@euro ISO-8859-7 -el_CY.UTF-8 UTF-8 -el_CY ISO-8859-7 -en_AG UTF-8 -en_AU.UTF-8 UTF-8 -en_AU ISO-8859-1 -en_BW.UTF-8 UTF-8 -en_BW ISO-8859-1 -en_CA.UTF-8 UTF-8 -en_CA ISO-8859-1 -en_DK.UTF-8 UTF-8 -en_DK.ISO-8859-15 ISO-8859-15 -en_DK ISO-8859-1 -en_GB.UTF-8 UTF-8 -en_GB ISO-8859-1 -en_GB.ISO-8859-15 ISO-8859-15 -en_HK.UTF-8 UTF-8 -en_HK ISO-8859-1 -en_IE.UTF-8 UTF-8 -en_IE ISO-8859-1 -en_IE@euro ISO-8859-15 -en_IL UTF-8 -en_IN UTF-8 -en_NG UTF-8 -en_NZ.UTF-8 UTF-8 -en_NZ ISO-8859-1 -en_PH.UTF-8 UTF-8 -en_PH ISO-8859-1 -en_SC.UTF-8 UTF-8 -en_SG.UTF-8 UTF-8 -en_SG ISO-8859-1 -en_US.UTF-8 UTF-8 -en_US ISO-8859-1 -en_US.ISO-8859-15 ISO-8859-15 -en_ZA.UTF-8 UTF-8 -en_ZA ISO-8859-1 -en_ZM UTF-8 -en_ZW.UTF-8 UTF-8 -en_ZW ISO-8859-1 -eo UTF-8 -es_AR.UTF-8 UTF-8 -es_AR ISO-8859-1 -es_BO.UTF-8 UTF-8 -es_BO ISO-8859-1 -es_CL.UTF-8 UTF-8 -es_CL ISO-8859-1 -es_CO.UTF-8 UTF-8 -es_CO ISO-8859-1 -es_CR.UTF-8 UTF-8 -es_CR ISO-8859-1 -es_CU UTF-8 -es_DO.UTF-8 UTF-8 -es_DO ISO-8859-1 -es_EC.UTF-8 UTF-8 -es_EC ISO-8859-1 -es_ES.UTF-8 UTF-8 -es_ES ISO-8859-1 -es_ES@euro ISO-8859-15 -es_GT.UTF-8 UTF-8 -es_GT ISO-8859-1 -es_HN.UTF-8 UTF-8 -es_HN ISO-8859-1 -es_MX.UTF-8 UTF-8 -es_MX ISO-8859-1 -es_NI.UTF-8 UTF-8 -es_NI ISO-8859-1 -es_PA.UTF-8 UTF-8 -es_PA ISO-8859-1 -es_PE.UTF-8 UTF-8 -es_PE ISO-8859-1 -es_PR.UTF-8 UTF-8 -es_PR ISO-8859-1 -es_PY.UTF-8 UTF-8 -es_PY ISO-8859-1 -es_SV.UTF-8 UTF-8 -es_SV ISO-8859-1 -es_US.UTF-8 UTF-8 -es_US ISO-8859-1 -es_UY.UTF-8 UTF-8 -es_UY ISO-8859-1 -es_VE.UTF-8 UTF-8 -es_VE ISO-8859-1 -et_EE.UTF-8 UTF-8 -et_EE ISO-8859-1 -et_EE.ISO-8859-15 ISO-8859-15 -eu_ES.UTF-8 UTF-8 -eu_ES ISO-8859-1 -eu_ES@euro ISO-8859-15 -eu_FR.UTF-8 UTF-8 -eu_FR ISO-8859-1 -eu_FR@euro ISO-8859-15 -fa_IR UTF-8 -ff_SN UTF-8 -fi_FI.UTF-8 UTF-8 -fi_FI ISO-8859-1 -fi_FI@euro ISO-8859-15 -fil_PH UTF-8 -fo_FO.UTF-8 UTF-8 -fo_FO ISO-8859-1 -fr_BE.UTF-8 UTF-8 -fr_BE ISO-8859-1 -fr_BE@euro ISO-8859-15 -fr_CA.UTF-8 UTF-8 -fr_CA ISO-8859-1 -fr_CH.UTF-8 UTF-8 -fr_CH ISO-8859-1 -fr_FR.UTF-8 UTF-8 -fr_FR ISO-8859-1 -fr_FR@euro ISO-8859-15 -fr_LU.UTF-8 UTF-8 -fr_LU ISO-8859-1 -fr_LU@euro ISO-8859-15 -fur_IT UTF-8 -fy_NL UTF-8 -fy_DE UTF-8 -ga_IE.UTF-8 UTF-8 -ga_IE ISO-8859-1 -ga_IE@euro ISO-8859-15 -gd_GB.UTF-8 UTF-8 -gd_GB ISO-8859-15 -gez_ER UTF-8 -gez_ER@abegede UTF-8 -gez_ET UTF-8 -gez_ET@abegede UTF-8 -gl_ES.UTF-8 UTF-8 -gl_ES ISO-8859-1 -gl_ES@euro ISO-8859-15 -gu_IN UTF-8 -gv_GB.UTF-8 UTF-8 -gv_GB ISO-8859-1 -ha_NG UTF-8 -hak_TW UTF-8 -he_IL.UTF-8 UTF-8 -he_IL ISO-8859-8 -hi_IN UTF-8 -hif_FJ UTF-8 -hne_IN UTF-8 -hr_HR.UTF-8 UTF-8 -hr_HR ISO-8859-2 -hsb_DE.UTF-8 UTF-8 -hsb_DE ISO-8859-2 -ht_HT UTF-8 -hu_HU.UTF-8 UTF-8 -hu_HU ISO-8859-2 -hy_AM UTF-8 -hy_AM.ARMSCII-8 ARMSCII-8 -ia_FR UTF-8 -id_ID.UTF-8 UTF-8 -id_ID ISO-8859-1 -ig_NG UTF-8 -ik_CA UTF-8 -is_IS.UTF-8 UTF-8 -is_IS ISO-8859-1 -it_CH.UTF-8 UTF-8 -it_CH ISO-8859-1 -it_IT.UTF-8 UTF-8 -it_IT ISO-8859-1 -it_IT@euro ISO-8859-15 -iu_CA UTF-8 -ja_JP.UTF-8 UTF-8 -ja_JP.EUC-JP EUC-JP -ka_GE.UTF-8 UTF-8 -ka_GE GEORGIAN-PS -kab_DZ UTF-8 -kk_KZ.UTF-8 UTF-8 -kk_KZ PT154 -kk_KZ.RK1048 RK1048 -kl_GL.UTF-8 UTF-8 -kl_GL ISO-8859-1 -km_KH UTF-8 -kn_IN UTF-8 -ko_KR.UTF-8 UTF-8 -ko_KR.EUC-KR EUC-KR -kok_IN UTF-8 -ks_IN UTF-8 -ks_IN@devanagari UTF-8 -ku_TR.UTF-8 UTF-8 -ku_TR ISO-8859-9 -kw_GB.UTF-8 UTF-8 -kw_GB ISO-8859-1 -ky_KG UTF-8 -lb_LU UTF-8 -lg_UG.UTF-8 UTF-8 -lg_UG ISO-8859-10 -li_BE UTF-8 -li_NL UTF-8 -lij_IT UTF-8 -ln_CD UTF-8 -lo_LA UTF-8 -lt_LT.UTF-8 UTF-8 -lt_LT ISO-8859-13 -lv_LV.UTF-8 UTF-8 -lv_LV ISO-8859-13 -lzh_TW UTF-8 -mag_IN UTF-8 -mai_IN UTF-8 -mai_NP UTF-8 -mfe_MU UTF-8 -mg_MG.UTF-8 UTF-8 -mg_MG ISO-8859-15 -mhr_RU UTF-8 -mi_NZ.UTF-8 UTF-8 -mi_NZ ISO-8859-13 -miq_NI UTF-8 -mjw_IN UTF-8 -mk_MK.UTF-8 UTF-8 -mk_MK ISO-8859-5 -ml_IN UTF-8 -mn_MN UTF-8 -mni_IN UTF-8 -mr_IN UTF-8 -ms_MY.UTF-8 UTF-8 -ms_MY ISO-8859-1 -mt_MT.UTF-8 UTF-8 -mt_MT ISO-8859-3 -my_MM UTF-8 -nan_TW UTF-8 -nan_TW@latin UTF-8 -nb_NO.UTF-8 UTF-8 -nb_NO ISO-8859-1 -nds_DE UTF-8 -nds_NL UTF-8 -ne_NP UTF-8 -nhn_MX UTF-8 -niu_NU UTF-8 -niu_NZ UTF-8 -nl_AW UTF-8 -nl_BE.UTF-8 UTF-8 -nl_BE ISO-8859-1 -nl_BE@euro ISO-8859-15 -nl_NL.UTF-8 UTF-8 -nl_NL ISO-8859-1 -nl_NL@euro ISO-8859-15 -nn_NO.UTF-8 UTF-8 -nn_NO ISO-8859-1 -nr_ZA UTF-8 -nso_ZA UTF-8 -oc_FR.UTF-8 UTF-8 -oc_FR ISO-8859-1 -om_ET UTF-8 -om_KE.UTF-8 UTF-8 -om_KE ISO-8859-1 -or_IN UTF-8 -os_RU UTF-8 -pa_IN UTF-8 -pa_PK UTF-8 -pap_AW UTF-8 -pap_CW UTF-8 -pl_PL.UTF-8 UTF-8 -pl_PL ISO-8859-2 -ps_AF UTF-8 -pt_BR.UTF-8 UTF-8 -pt_BR ISO-8859-1 -pt_PT.UTF-8 UTF-8 -pt_PT ISO-8859-1 -pt_PT@euro ISO-8859-15 -quz_PE UTF-8 -raj_IN UTF-8 -ro_RO.UTF-8 UTF-8 -ro_RO ISO-8859-2 -ru_RU.UTF-8 UTF-8 -ru_RU.KOI8-R KOI8-R -ru_RU ISO-8859-5 -ru_RU.CP1251 CP1251 -ru_UA.UTF-8 UTF-8 -ru_UA KOI8-U -rw_RW UTF-8 -sa_IN UTF-8 -sah_RU UTF-8 -sat_IN UTF-8 -sc_IT UTF-8 -sd_IN UTF-8 -sd_IN@devanagari UTF-8 -se_NO UTF-8 -sgs_LT UTF-8 -shn_MM UTF-8 -shs_CA UTF-8 -si_LK UTF-8 -sid_ET UTF-8 -sk_SK.UTF-8 UTF-8 -sk_SK ISO-8859-2 -sl_SI.UTF-8 UTF-8 -sl_SI ISO-8859-2 -sm_WS UTF-8 -so_DJ.UTF-8 UTF-8 -so_DJ ISO-8859-1 -so_ET UTF-8 -so_KE.UTF-8 UTF-8 -so_KE ISO-8859-1 -so_SO.UTF-8 UTF-8 -so_SO ISO-8859-1 -sq_AL.UTF-8 UTF-8 -sq_AL ISO-8859-1 -sq_MK UTF-8 -sr_ME UTF-8 -sr_RS UTF-8 -sr_RS@latin UTF-8 -ss_ZA UTF-8 -st_ZA.UTF-8 UTF-8 -st_ZA ISO-8859-1 -sv_FI.UTF-8 UTF-8 -sv_FI ISO-8859-1 -sv_FI@euro ISO-8859-15 -sv_SE.UTF-8 UTF-8 -sv_SE ISO-8859-1 -sv_SE.ISO-8859-15 ISO-8859-15 -sw_KE UTF-8 -sw_TZ UTF-8 -szl_PL UTF-8 -ta_IN UTF-8 -ta_LK UTF-8 -tcy_IN.UTF-8 UTF-8 -te_IN UTF-8 -tg_TJ.UTF-8 UTF-8 -tg_TJ KOI8-T -th_TH.UTF-8 UTF-8 -th_TH TIS-620 -the_NP UTF-8 -ti_ER UTF-8 -ti_ET UTF-8 -tig_ER UTF-8 -tk_TM UTF-8 -tl_PH.UTF-8 UTF-8 -tl_PH ISO-8859-1 -tn_ZA UTF-8 -to_TO UTF-8 -tpi_PG UTF-8 -tr_CY.UTF-8 UTF-8 -tr_CY ISO-8859-9 -tr_TR.UTF-8 UTF-8 -tr_TR ISO-8859-9 -ts_ZA UTF-8 -tt_RU UTF-8 -tt_RU@iqtelif UTF-8 -ug_CN UTF-8 -uk_UA.UTF-8 UTF-8 -uk_UA KOI8-U -unm_US UTF-8 -ur_IN UTF-8 -ur_PK UTF-8 -uz_UZ.UTF-8 UTF-8 -uz_UZ ISO-8859-1 -uz_UZ@cyrillic UTF-8 -ve_ZA UTF-8 -vi_VN UTF-8 -wa_BE.UTF-8 UTF-8 -wa_BE ISO-8859-1 -wa_BE@euro ISO-8859-15 -wae_CH UTF-8 -wal_ET UTF-8 -wo_SN UTF-8 -xh_ZA.UTF-8 UTF-8 -xh_ZA ISO-8859-1 -yi_US.UTF-8 UTF-8 -yi_US CP1255 -yo_NG UTF-8 -yue_HK UTF-8 -yuw_PG UTF-8 -zh_CN.UTF-8 UTF-8 -zh_CN.GB18030 GB18030 -zh_CN.GBK GBK -zh_CN GB2312 -zh_HK.UTF-8 UTF-8 -zh_HK BIG5-HKSCS -zh_SG.UTF-8 UTF-8 -zh_SG.GBK GBK -zh_SG GB2312 -zh_TW.UTF-8 UTF-8 -zh_TW.EUC-TW EUC-TW -zh_TW BIG5 -zu_ZA.UTF-8 UTF-8 -zu_ZA ISO-8859-1 - diff --git a/epicmorg/prod/main/.docker-repository.yml b/epicmorg/prod/main/.docker-repository.yml new file mode 100644 index 000000000..1e50bcd0a --- /dev/null +++ b/epicmorg/prod/main/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/prod diff --git a/epicmorg/prod/main/.dockerignore b/epicmorg/prod/main/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/epicmorg/prod/main/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/epicmorg/prod-jdk8/Dockerfile b/epicmorg/prod/main/Dockerfile similarity index 61% rename from epicmorg/prod-jdk8/Dockerfile rename to epicmorg/prod/main/Dockerfile index a9c4bef17..e472cfb5e 100644 --- a/epicmorg/prod-jdk8/Dockerfile +++ b/epicmorg/prod/main/Dockerfile @@ -60,22 +60,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio wget \ zip -################################################################## -# installing java8 -################################################################## -#RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys A66C5D02 && \ -# echo 'deb https://rpardini.github.io/adoptopenjdk-deb-installer stable main' > /etc/apt/sources.list.d/rpardini-aoj.list && \ -# apt-get update && \ -# apt-get install -y --allow-unauthenticated adoptopenjdk-8-installer - -RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | sudo 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 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 ################################################################## diff --git a/epicmorg/prod-jdk8/Makefile b/epicmorg/prod/main/Makefile similarity index 100% rename from epicmorg/prod-jdk8/Makefile rename to epicmorg/prod/main/Makefile diff --git a/epicmorg/prod-jdk8/deb-multimedia-keyring.gpg b/epicmorg/prod/main/deb-multimedia-keyring.gpg similarity index 100% rename from epicmorg/prod-jdk8/deb-multimedia-keyring.gpg rename to epicmorg/prod/main/deb-multimedia-keyring.gpg diff --git a/epicmorg/prod-jdk8/locale.gen b/epicmorg/prod/main/locale.gen similarity index 100% rename from epicmorg/prod-jdk8/locale.gen rename to epicmorg/prod/main/locale.gen diff --git a/epicmorg/prod-jdk8/locale.gen.full b/epicmorg/prod/main/locale.gen.full similarity index 100% rename from epicmorg/prod-jdk8/locale.gen.full rename to epicmorg/prod/main/locale.gen.full diff --git a/epicmorg/prod-jdk8/sources.list b/epicmorg/prod/main/sources.list similarity index 100% rename from epicmorg/prod-jdk8/sources.list rename to epicmorg/prod/main/sources.list diff --git a/epicmorg/prod/sources.list b/epicmorg/prod/sources.list deleted file mode 100644 index e8180240e..000000000 --- a/epicmorg/prod/sources.list +++ /dev/null @@ -1,17 +0,0 @@ -#main -deb http://ftp.ru.debian.org/debian/ buster main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ buster main contrib non-free -deb http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ buster-updates main contrib non-free -deb http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian/ buster-proposed-updates main contrib non-free - -#security -deb http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free -deb-src http://ftp.ru.debian.org/debian-security/ buster/updates main contrib non-free - -##multimedia -#deb http://ftp.ru.debian.org/debian-multimedia/ buster main non-free -#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster main non-free -#deb http://ftp.ru.debian.org/debian-multimedia/ buster-backports main -#deb-src http://ftp.ru.debian.org/debian-multimedia/ buster-backports main diff --git a/teamcity-agent/Dockerfile b/teamcity-agent/Dockerfile index cc20494f6..ac578d7fb 100644 --- a/teamcity-agent/Dockerfile +++ b/teamcity-agent/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/devel +FROM epicmorg/devel:jdk11 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive