diff --git a/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile b/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile index 8221dcdac..6d457488a 100644 --- a/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile +++ b/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile @@ -28,6 +28,9 @@ EXPOSE 7999 ################################################################## # Installing ################################################################## +RUN apt update && \ + apt install -y --allow-downgrades git/bullseye-backports + RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \ && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ diff --git a/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile.jdk11 index fd63115ce..932e73c25 100644 --- a/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/bitbucket/8/8.7.0/Dockerfile.jdk11 @@ -28,6 +28,9 @@ EXPOSE 7999 ################################################################## # Installing ################################################################## +RUN apt update && \ + apt install -y --allow-downgrades git/bullseye-backports + RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \ && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ diff --git a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile index 166150635..bec6d3a46 100644 --- a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile +++ b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=7.21.0 +ARG BITBUCKET_VERSION=8.7.0 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz ################################################################## @@ -28,6 +28,9 @@ EXPOSE 7999 ################################################################## # Installing ################################################################## +RUN apt update && \ + apt install --allow-downgrades -y git/bullseye-backports + RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \ && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ diff --git a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 index df9b0ad99..e7f3a3f2f 100644 --- a/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/bitbucket/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=7.21.0 +ARG BITBUCKET_VERSION=8.7.0 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz ################################################################## @@ -28,6 +28,9 @@ EXPOSE 7999 ################################################################## # Installing ################################################################## +RUN apt update && \ + apt install --allow-downgrades -y git/bullseye-backports + RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \ && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \ && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \ diff --git a/linux/ecosystem/atlassian/confluence/8/8.0.0/Dockerfile b/linux/ecosystem/atlassian/confluence/8/8.0.0/Dockerfile index 1740f38c7..7612b3f12 100644 --- a/linux/ecosystem/atlassian/confluence/8/8.0.0/Dockerfile +++ b/linux/ecosystem/atlassian/confluence/8/8.0.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/debian:bullseye-jdk8 +FROM epicmorg/debian:bullseye-jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/atlassian/confluence/8/8.0.1/Dockerfile b/linux/ecosystem/atlassian/confluence/8/8.0.1/Dockerfile index 1740f38c7..7612b3f12 100644 --- a/linux/ecosystem/atlassian/confluence/8/8.0.1/Dockerfile +++ b/linux/ecosystem/atlassian/confluence/8/8.0.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/debian:bullseye-jdk8 +FROM epicmorg/debian:bullseye-jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/atlassian/confluence/8/8.0.2/Dockerfile b/linux/ecosystem/atlassian/confluence/8/8.0.2/Dockerfile index 1740f38c7..7612b3f12 100644 --- a/linux/ecosystem/atlassian/confluence/8/8.0.2/Dockerfile +++ b/linux/ecosystem/atlassian/confluence/8/8.0.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/debian:bullseye-jdk8 +FROM epicmorg/debian:bullseye-jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile b/linux/ecosystem/atlassian/confluence/latest/Dockerfile index 7c7da4506..38c91bc7e 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile @@ -1,11 +1,11 @@ -FROM epicmorg/debian:bullseye-jdk8 +FROM epicmorg/debian:bullseye-jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.19.1 +ARG CONFLUENCE_VERSION=8.0.2 ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 index 2ea4b195a..ece0272ae 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.19.1 +ARG CONFLUENCE_VERSION=8.0.2 ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 index 3ab236121..4610d4934 100644 --- a/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 +++ b/linux/ecosystem/atlassian/confluence/latest/Dockerfile.jdk17 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.19.1 +ARG CONFLUENCE_VERSION=8.0.2 ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile index 73744b7ed..f7ce6b9a6 100644 --- a/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/08-jessie/develop/Dockerfile @@ -113,7 +113,7 @@ RUN apt-get update && \ ################################################################## # Rust compillers ################################################################## -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile complete --default-toolchain stable --verbose +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile complete --default-toolchain stable --verbose RUN printf "\n--------------------------------\n$(cargo --version)\n--------------------------------\n\n" ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile index 089e7beac..baed8c9b2 100644 --- a/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/09-stretch/develop/Dockerfile @@ -113,7 +113,7 @@ RUN apt-get update && \ ################################################################## # Rust compillers ################################################################## -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile complete --default-toolchain stable --verbose +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile complete --default-toolchain stable --verbose RUN printf "\n--------------------------------\n$(cargo --version)\n--------------------------------\n\n" ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile index c2906c2a4..ad371ff4a 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/10-buster/develop/Dockerfile @@ -114,7 +114,7 @@ RUN apt-get update && \ ################################################################## # Rust compillers ################################################################## -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile complete --default-toolchain stable --verbose +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile complete --default-toolchain stable --verbose RUN printf "\n--------------------------------\n$(cargo --version)\n--------------------------------\n\n" ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list index c48739d8d..fbd07f061 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -1,3 +1,3 @@ # mainline -deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main -deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu disco main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu disco main diff --git a/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list index 0f7803eaf..38afb723c 100644 --- a/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list +++ b/linux/ecosystem/epicmorg/debian/10-buster/main/etc/apt/sources.list.d/launchpad_git-stable.list @@ -1,3 +1,3 @@ # stable -deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main -deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu disco main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu disco main diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile index 55128402c..330dedd22 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/develop/Dockerfile @@ -114,7 +114,7 @@ RUN apt-get update && \ ################################################################## # Rust compillers ################################################################## -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile complete --default-toolchain stable --verbose +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile complete --default-toolchain stable --verbose RUN printf "\n--------------------------------\n$(cargo --version)\n--------------------------------\n\n" ################################################################## diff --git a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile index 5c3583b14..3d563effc 100644 --- a/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/11-bullseye/main/Dockerfile @@ -216,7 +216,7 @@ RUN wget -q --no-check-certificate -c https://github.com/Yelp/dumb-init/releases ################################################################## # grab gosu for easy step-down from root ################################################################## -ARG GOSU_VER 1.14 +ENV GOSU_VER 1.14 RUN wget -q --no-check-certificate -c https://github.com/tianon/gosu/releases/download/${GOSU_VER}/gosu-amd64 --random-wait -O /usr/local/bin/gosu && \ chmod +x /usr/local/bin/gosu && \ gosu --version diff --git a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile index 29565d55c..fa6316250 100644 --- a/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile +++ b/linux/ecosystem/epicmorg/debian/12-bookworm/develop/Dockerfile @@ -113,7 +113,7 @@ RUN apt-get update && \ ################################################################## # Rust compillers ################################################################## -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile complete --default-toolchain stable --verbose +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile complete --default-toolchain stable --verbose RUN printf "\n--------------------------------\n$(cargo --version)\n--------------------------------\n\n" ################################################################## diff --git a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list index c48739d8d..c09e7e566 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list +++ b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-mainline.list @@ -1,3 +1,3 @@ # mainline -deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main -deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu focal main +deb https://ppa.launchpadcontent.net/git-core/candidate/ubuntu cosmic main +deb-src https://ppa.launchpadcontent.net/git-core/candidate/ubuntu cosmic main diff --git a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list index 0f7803eaf..78be262bb 100644 --- a/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list +++ b/linux/ecosystem/epicmorg/python/main/2.7/etc/apt/sources.list.d/launchpad_git-stable.list @@ -1,3 +1,3 @@ # stable -deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main -deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu focal main +deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu cosmic main +deb-src https://ppa.launchpadcontent.net/git-core/ppa/ubuntu cosmic main