diff --git a/Makefile b/Makefile index 238c5b0b9..9cac58a0d 100644 --- a/Makefile +++ b/Makefile @@ -119,6 +119,10 @@ ecosystem-images: make ecosystem-nginx-images make ecosystem-vscode-server-images +ecosystem-debian-images: + make ecosystem-debian-jessie-images + make ecosystem-debian-stretch-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 diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile index fe3b1b186..f8abb036a 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/main/Dockerfile @@ -8,18 +8,6 @@ ARG DEBIAN_FRONTEND=noninteractive ENV P4_VERSION=r21.2 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 - -################################################################## -# LazyGit official binary -################################################################## -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 ################################################################## @@ -130,7 +118,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 +129,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 && \ @@ -150,31 +138,9 @@ RUN apt-get update && \ ################################################################## # Install p4client ################################################################## -RUN wget -nv --random-wait -c -P /usr/bin ${P4_DOWNLOAD_URL} && \ +RUN wget --no-check-certificate -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 - -################################################################## -# Install LazyGit official binary -################################################################## -RUN wget -nv --random-wait -c -O /tmp/lazygit.tar.xz ${LZGIT_DOWNLOAD_URL} && \ - mkdir -p /tmp/lazygit && \ - tar -zxvf /tmp/lazygit.tar.xz -C /tmp/lazygit && \ - chmod +x /tmp/lazygit/lazygit && \ - mv -fv /tmp/lazygit/lazygit /usr/bin/ && \ - echo "lazygit version:" && \ - lazygit --version - ################################################################## # Generate ssl key ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/main/etc/apt/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/debian/08-jessie/main/etc/apt/sources.list.d/github_git-lfs.list index 867534422..1d123ec51 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/main/etc/apt/sources.list.d/github_git-lfs.list +++ b/linux/ecosystem/epicmorg/debian/08-jessie/main/etc/apt/sources.list.d/github_git-lfs.list @@ -1,2 +1,2 @@ -deb https://packagecloud.io/github/git-lfs/debian/ buster main -deb-src https://packagecloud.io/github/git-lfs/debian/ buster main +deb https://packagecloud.io/github/git-lfs/debian/ jessie main +deb-src https://packagecloud.io/github/git-lfs/debian/ jessie main diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/main/etc/apt/sources.list.d/sources.list b/linux/ecosystem/epicmorg/debian/08-jessie/main/etc/apt/sources.list.d/sources.list deleted file mode 100644 index 412c35d1a..000000000 --- a/linux/ecosystem/epicmorg/debian/08-jessie/main/etc/apt/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 diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile index f519a28b9..682d3cb18 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/slim/Dockerfile @@ -44,6 +44,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio RUN apt-key list | grep "expired: " | sed -ne 's|pub .*/\([^ ]*\) .*|\1|gp' | xargs -n1 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys RUN apt-key adv --keyserver keyserver.ubuntu.com --refresh-keys +RUN update-ca-certificates + ################################################################## # update locales ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile index 8f9a7cb51..d9620719e 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile @@ -28,7 +28,7 @@ RUN apt-get update && \ # installing ################################################################## RUN apt-get update && \ - apt-get install -y --allow-unauthenticated \ + apt install -y --allow-unauthenticated --allow-downgrades \ build-essential \ autoconf-archive \ gnu-standards \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile index 25282695f..4cc773b14 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile @@ -5,14 +5,14 @@ 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/ stretch 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 stretch main' > /etc/apt/sources.list.d/temurin-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 && \ + 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 ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted new file mode 100644 index 000000000..25282695f --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/Dockerfile.adopted @@ -0,0 +1,26 @@ +FROM epicmorg/debian:stretch +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/ stretch 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 && \ + 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/debian/09-stretch/jdk11/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml index 2b8348d5e..8532e44ea 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk11/docker-compose.yml @@ -4,3 +4,9 @@ services: image: "epicmorg/debian:stretch-jdk11" build: context: . + app-old: + image: "epicmorg/debian:stretch-jdk11-adopted" + build: + context: . + dockerfile: ./Dockerfile.adopted + diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile index 70a825dfa..46d79632c 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile @@ -5,11 +5,14 @@ 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/ stretch main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \ +RUN RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \ + echo 'deb https://packages.adoptium.net/artifactory/deb stretch 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 && \ + mkdir /usr/lib/jvm/temurin-8-jdk-amd64/jre && \ + ln -s /usr/lib/jvm/temurin-8-jdk-amd64/bin/ /usr/lib/jvm/temurin-8-jdk-amd64/jre/bin && \ + ln -s /usr/lib/jvm/temurin-8-jdk-amd64/lib/ /usr/lib/jvm/temurin-8-jdk-amd64/jre/lib && \ java -version ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted new file mode 100644 index 000000000..70a825dfa --- /dev/null +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/Dockerfile.adopted @@ -0,0 +1,23 @@ +FROM epicmorg/debian:stretch +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/ stretch 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 && \ + 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/debian/09-stretch/jdk8/docker-compose.yml b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml index edc385007..682e05166 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml +++ b/linux/ecosystem/epicmorg/debian/09-stretch/jdk8/docker-compose.yml @@ -4,3 +4,8 @@ services: image: "epicmorg/debian:stretch-jdk8" build: context: . + app-old: + image: "epicmorg/debian:stretch-jdk8-adopted" + build: + context: . + dockerfile: ./Dockerfile.adopted diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile index d98e12f23..9faebc649 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/main/Dockerfile @@ -14,6 +14,12 @@ ENV P4_DOWNLOAD_URL=https://www.perforce.com/downloads/perforce/${P4_VERSION}/bi ENV SZ_VERSION=7z2103 ENV SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz +################################################################## +# LazyGit official binary +################################################################## +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 ################################################################## @@ -71,7 +77,6 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio mercurial \ nano \ nload \ - ntop \ nmap \ openssl \ perl \ @@ -93,7 +98,8 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio unrar \ xz-utils \ wget \ - zip + zip \ + libzip4 ################################################################## # installing fs-tools @@ -126,7 +132,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 \ @@ -137,7 +143,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 && \ diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/main/etc/apt/sources.list.d/github_git-lfs.list b/linux/ecosystem/epicmorg/debian/09-stretch/main/etc/apt/sources.list.d/github_git-lfs.list index 867534422..60811acd4 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/main/etc/apt/sources.list.d/github_git-lfs.list +++ b/linux/ecosystem/epicmorg/debian/09-stretch/main/etc/apt/sources.list.d/github_git-lfs.list @@ -1,2 +1,2 @@ -deb https://packagecloud.io/github/git-lfs/debian/ buster main -deb-src https://packagecloud.io/github/git-lfs/debian/ buster main +deb https://packagecloud.io/github/git-lfs/debian/ stretch main +deb-src https://packagecloud.io/github/git-lfs/debian/ stretch main diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/main/etc/apt/sources.list.d/sources.list b/linux/ecosystem/epicmorg/debian/09-stretch/main/etc/apt/sources.list.d/sources.list deleted file mode 100644 index 412c35d1a..000000000 --- a/linux/ecosystem/epicmorg/debian/09-stretch/main/etc/apt/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