diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d129449a..91b16b923 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * `september` * added [ArekSredzki/electron-release-server](https://github.com/ArekSredzki/electron-release-server/) support. * fully reworked `teamcity-agent` images. + * added `java 16` support to base images. * `august` * splited `tc-agents` with `nodejs` * fixed `PostgreSQL` images diff --git a/linux/epicmorg/devel/jdk16/Dockerfile b/linux/epicmorg/devel/jdk16/Dockerfile new file mode 100644 index 000000000..18a382df5 --- /dev/null +++ b/linux/epicmorg/devel/jdk16/Dockerfile @@ -0,0 +1,24 @@ +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/epicmorg/devel/jdk16/Makefile b/linux/epicmorg/devel/jdk16/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/epicmorg/devel/jdk16/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/devel/jdk16/docker-compose.yml b/linux/epicmorg/devel/jdk16/docker-compose.yml new file mode 100644 index 000000000..d72619833 --- /dev/null +++ b/linux/epicmorg/devel/jdk16/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/devel:jdk16" + build: + context: . diff --git a/linux/epicmorg/edge/jdk16/Dockerfile b/linux/epicmorg/edge/jdk16/Dockerfile new file mode 100644 index 000000000..9b8a6ec8b --- /dev/null +++ b/linux/epicmorg/edge/jdk16/Dockerfile @@ -0,0 +1,24 @@ +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/epicmorg/edge/jdk16/Makefile b/linux/epicmorg/edge/jdk16/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/epicmorg/edge/jdk16/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/edge/jdk16/docker-compose.yml b/linux/epicmorg/edge/jdk16/docker-compose.yml new file mode 100644 index 000000000..7945ea454 --- /dev/null +++ b/linux/epicmorg/edge/jdk16/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/edge:jdk16" + build: + context: . diff --git a/linux/epicmorg/prod/jdk16/Dockerfile b/linux/epicmorg/prod/jdk16/Dockerfile new file mode 100644 index 000000000..dbe7f1aaa --- /dev/null +++ b/linux/epicmorg/prod/jdk16/Dockerfile @@ -0,0 +1,23 @@ +FROM epicmorg/prod +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/epicmorg/prod/jdk16/Makefile b/linux/epicmorg/prod/jdk16/Makefile new file mode 100644 index 000000000..82c5a2de6 --- /dev/null +++ b/linux/epicmorg/prod/jdk16/Makefile @@ -0,0 +1,5 @@ +all: app + +app: + docker-compose build --compress + docker-compose push diff --git a/linux/epicmorg/prod/jdk16/docker-compose.yml b/linux/epicmorg/prod/jdk16/docker-compose.yml new file mode 100644 index 000000000..4d284744c --- /dev/null +++ b/linux/epicmorg/prod/jdk16/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.9' +services: + app: + image: "epicmorg/prod:jdk16" + build: + context: . diff --git a/linux/epicmorg/prod/main/.selected_editor b/linux/epicmorg/prod/main/.selected_editor deleted file mode 100644 index dbc007294..000000000 --- a/linux/epicmorg/prod/main/.selected_editor +++ /dev/null @@ -1,2 +0,0 @@ -# Generated by /usr/bin/select-editor -SELECTED_EDITOR="/usr/bin/mcedit" diff --git a/linux/epicmorg/prod/main/Dockerfile b/linux/epicmorg/prod/main/Dockerfile index a7a9564eb..e849863c1 100644 --- a/linux/epicmorg/prod/main/Dockerfile +++ b/linux/epicmorg/prod/main/Dockerfile @@ -15,8 +15,14 @@ RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done ################################################################## # perforce client binary ################################################################## -ARG P4_VERSION=r21.1 -ARG P4_DOWNLOAD_URL=http://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 +ENV P4_VERSION=r21.1 +ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4 + +################################################################## +# 7z official binary +################################################################## +ENV SZ_VERSION=7z2103 +ENV SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz ################################################################## # installing utils @@ -29,12 +35,14 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio aptitude \ bash \ binutils \ + bzip2 \ ca-certificates \ cmatrix \ cmatrix-xfont \ console-cyrillic \ cron \ curl \ + clzip \ dos2unix \ ffmpeg \ fontconfig \ @@ -42,17 +50,24 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio gnupg \ gnupg2 \ graphicsmagick \ + gzip \ htop \ iftop \ iputils-ping \ jq \ kmod \ + libxml2-dev \ + libxml2-utils \ + lbzip2 \ libsvn-java \ - libzip4 \ locales \ lsb-release \ lsof \ lynx \ + lzma \ + libzip4 \ + lzip \ + lzop \ mc \ mercurial \ nano \ @@ -61,7 +76,12 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio openssl \ perl \ procps \ + pbzip2 \ + plzip \ + p7zip-full \ + p7zip-rar \ rsync \ + rar \ screenfetch \ smbclient \ software-properties-common \ @@ -73,18 +93,32 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio tree \ util-linux \ uuid-runtime \ + unrar \ + xz-utils \ wget \ - zip && \ - wget -nv --random-wait -c -P /usr/bin ${P4_DOWNLOAD_URL} && \ - chmod +x /usr/bin/p4 && \ - openssl dhparam -out /etc/ssl/dhparam.pem 4096 + zip ################################################################## -# Post-cosmetics +# Install p4client ################################################################## -COPY ./.selected_editor /root/.selected_editor -COPY ./mc.patch /tmp/mc.patch -#RUN patch /tmp/mc.patch /root/.config/mc/ini +RUN wget -nv --random-wait -c -P /usr/bin ${P4_DOWNLOAD_URL} && \ + chmod +x /usr/bin/p4 + +################################################################## +# Install 7z official binary +################################################################## +RUN wget -nv --random-wait -c -O /tmp/7z.tar.xz ${SZ_DOWNLOAD_URL} && \ + mkdir -p /tmp/7z && \ + tar -xf /tmp/7z.tar.xz -C /tmp/7z && \ + chmod +x /tmp/7z/7zz && \ + mv -fv /tmp/7z/7zz /usr/bin/ && \ + 7zz | head -4 && \ + 7z | head -4 + +################################################################## +# Generate ssl key +################################################################## +RUN openssl dhparam -out /etc/ssl/dhparam.pem 4096 ################################################################## # cleaninig up @@ -94,4 +128,5 @@ RUN apt purge policykit-1 -y && \ apt autoclean -y && \ rm -rfv /var/lib/apt/lists/* && \ rm -rfv /tmp/mc.patch && \ - rm -rfv /var/cache/apt/archives/*.deb + rm -rfv /var/cache/apt/archives/*.deb && \ + rm -rfv /tmp/7z diff --git a/linux/epicmorg/prod/main/mc.patch b/linux/epicmorg/prod/main/mc.patch deleted file mode 100644 index 075948e1d..000000000 --- a/linux/epicmorg/prod/main/mc.patch +++ /dev/null @@ -1,17 +0,0 @@ -86,88c86 -< skin=default -< -< filepos_max_saved_entries=1024 ---- -> skin=dark -109c107 -< display_codepage=ASCII ---- -> display_codepage=UTF-8 -132c130 -< navigate_with_arrows=false ---- -> navigate_with_arrows=true -140a139,140 -> -> simple_swap=false