From 216227a38a8390ae2a4d8deab2ecb4aa8321c4c4 Mon Sep 17 00:00:00 2001 From: Odmin Date: Thu, 11 Mar 2021 00:28:50 +0300 Subject: [PATCH 1/6] apt update --- epicmorg/prod/main/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile index eec07ce14..f2da08333 100644 --- a/epicmorg/prod/main/Dockerfile +++ b/epicmorg/prod/main/Dockerfile @@ -26,6 +26,7 @@ RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selectio apt-get install -y --allow-unauthenticated \ apt-transport-https \ apt-utils \ + aptitude \ bash \ binutils \ ca-certificates \ From f27717f16caa63e417237b8dc286c28836d01669 Mon Sep 17 00:00:00 2001 From: Odmin Date: Thu, 11 Mar 2021 01:04:47 +0300 Subject: [PATCH 2/6] testrail --- CHANGELOG.md | 7 +++++++ testrail/latest/Dockerfile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a6b996b7..e41584ef6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## Changelog ### 2021 +* `march` + * `apache2`, `nginx`, `php` - fixed php versions, fixed dependency hell. code updated. + * `nginx` 1.19.8 + * `testrail` v7+ migrated to `php 7.4` + updated `atlassian` images +* `february` + * hm.. nothing * `january` * splitted `php` from `websites` images. all versions - `7.2-7.4`. * updated `ioncube loader` for `php7.4`. enabled by degault. diff --git a/testrail/latest/Dockerfile b/testrail/latest/Dockerfile index 1a0474612..6a09a9575 100644 --- a/testrail/latest/Dockerfile +++ b/testrail/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/websites:php7.2 +FROM epicmorg/websites:php7.4 ARG TESTRAIL_VERSION=latest ARG DOWNLOAD_URL=https://secure.gurock.com/downloads/testrail/testrail-${TESTRAIL_VERSION}-ion71.zip From 0c3e08e31bab882346daa833495c2fddfdac8215 Mon Sep 17 00:00:00 2001 From: Odmin Date: Thu, 11 Mar 2021 01:17:02 +0300 Subject: [PATCH 3/6] php 7.3 relative container fix --- php/php7.3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/php7.3/Dockerfile b/php/php7.3/Dockerfile index fa26f56e4..04329aa75 100644 --- a/php/php7.3/Dockerfile +++ b/php/php7.3/Dockerfile @@ -76,7 +76,7 @@ RUN cd ${MAKE_DIR} && \ ################################################################## ################################################################## -FROM epicmorg/edge +FROM epicmorg/prod LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive From 704b4e3ea5493d04caa1806f0e3f224006da6512 Mon Sep 17 00:00:00 2001 From: Odmin Date: Thu, 11 Mar 2021 01:17:28 +0300 Subject: [PATCH 4/6] nginx 1.19.8 --- balancer/latest/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/balancer/latest/Dockerfile b/balancer/latest/Dockerfile index dcf1e334c..1d49a17ba 100644 --- a/balancer/latest/Dockerfile +++ b/balancer/latest/Dockerfile @@ -11,7 +11,7 @@ ARG SRC_DIR=${BUILDS_DIR}/src ARG EXPORT_DIR=${BUILDS_DIR}/export ARG PRE_DIR=${BUILDS_DIR}/pre ARG NGINX_SRC_DIR=${SRC_DIR}/nginx -ARG NGINX_VERSION=1.19.6 +ARG NGINX_VERSION=1.19.8 ARG NGINX_DOWNLOAD_URL=http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz ARG LUAJIT_INC=/usr/local/include/luajit-2.1 ARG LUAJIT_LIB=/usr/local/lib From 4286941d538e7fb0a50bf56c8d5310c967a05e6d Mon Sep 17 00:00:00 2001 From: Odmin Date: Thu, 11 Mar 2021 01:17:46 +0300 Subject: [PATCH 5/6] php 7.4 dependency hell fix --- balancer/php/Dockerfile | 104 ++++++++++++++++++++++--------------- php/latest/Dockerfile | 104 +++++++++++++++++++++---------------- php/php7.4/Dockerfile | 104 +++++++++++++++++++++---------------- websites/latest/Dockerfile | 11 +++- websites/php7.4/Dockerfile | 13 +++-- 5 files changed, 198 insertions(+), 138 deletions(-) diff --git a/balancer/php/Dockerfile b/balancer/php/Dockerfile index 26df128c2..b658799a0 100644 --- a/balancer/php/Dockerfile +++ b/balancer/php/Dockerfile @@ -20,7 +20,7 @@ ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux ARG P4PHP_VER=r20.1 ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz -ARG P4MODULE_PATH=/usr/lib/php/20190902 +ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ################################################################## # Files and folders @@ -31,13 +31,12 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P # Installing PHP7 ################################################################## #installing php repo -RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ + smbclient libsmbclient libsmbclient-dev \ php7.4 \ php7.4-dev \ php7.4-fpm \ @@ -70,7 +69,14 @@ RUN cd ${MAKE_DIR} && \ make && \ make test && \ make install && \ - cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} + + +################################################################## +# compilling smbclient +################################################################## +RUN pecl install smbclient && \ + cp ${PHP_MODULE_PATH}/smbclient.so ${EXPORT_DIR} ################################################################## ################################################################## @@ -88,59 +94,58 @@ ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ARG PHP_VER=7.4 ARG PHP_DIR=/etc/php/${PHP_VER} ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini ################################################################## # Installing PHP7 ################################################################## -#installing php repo -RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' - #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ - libmemcached-dev \ php7.4 \ php7.4-dev \ php7.4-fpm \ php7.4-cli \ php7.4-cgi \ php-pear \ - php-gmp \ - php-snmp \ - php-ldap \ - php-mail \ - php-soap \ - php-mysql \ - php-memcached \ - php-memcache \ - php-igbinary \ - php-curl \ - php-gd \ - php-intl \ - php-zip \ - php-bcmath \ - php-imap \ - php-pspell \ - php-sqlite3 \ - php-tidy \ - php-xmlrpc \ - php-xml \ - php-mbstring \ - php-apcu \ - php-common \ - php-json \ - php-readline \ - php-enchant \ - php-ssh2 \ - php-oauth \ - php-gmagick \ - php-gnupg \ - php-redis \ - php-smbclient \ - php-yaml \ - php-geoip \ + php7.4-gmp \ + php7.4-snmp \ + php7.4-ldap \ + php7.4-mail \ + php7.4-soap \ + php7.4-mysql \ + php7.4-memcached \ + php7.4-memcache \ + php7.4-igbinary \ + php7.4-interbase \ + php7.4-curl \ + php7.4-gd \ + php7.4-intl \ + php7.4-zip \ + php7.4-bcmath \ + php7.4-imap \ + php7.4-pspell \ + php7.4-sqlite3 \ + php7.4-tidy \ + php7.4-xmlrpc \ + php7.4-xml \ + php7.4-mbstring \ + php7.4-apcu \ + php7.4-common \ + php7.4-json \ + php7.4-readline \ + php7.4-enchant \ + php7.4-ssh2 \ + php7.4-oauth \ + php7.4-gmagick \ + php7.4-gnupg \ + php7.4-redis \ + smbclient libsmbclient \ +# php-smbclient \ + php7.4-yaml \ + php7.4-geoip \ sendmail && \ + update-alternatives --set php /usr/bin/php7.4 && \ phpenmod \ snmp \ gmp \ @@ -205,6 +210,19 @@ RUN echo "extension=perforce.so" > ${P4_PHP_INI} && \ php -m && \ php -v +################################################################## +# Installing smbclient addon +################################################################## +COPY --from=builder /builds/export/smbclient.so ${PHP_MODULE_PATH} +RUN echo "extension=smbclient.so" > ${SMB_PHP_INI} && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cgi/conf.d/smbclient.ini && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cli/conf.d/smbclient.ini && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/fpm/conf.d/smbclient.ini && \ + php -m && \ + php -v + + + ################################################################## # Installing Composer addon ################################################################## diff --git a/php/latest/Dockerfile b/php/latest/Dockerfile index 6fad82245..aa52f1c23 100644 --- a/php/latest/Dockerfile +++ b/php/latest/Dockerfile @@ -20,7 +20,7 @@ ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux ARG P4PHP_VER=r20.1 ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz -ARG P4MODULE_PATH=/usr/lib/php/20190902 +ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ################################################################## # Files and folders @@ -30,14 +30,11 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## # Installing PHP7 ################################################################## -#installing php repo -RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' - #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ + smbclient libsmbclient libsmbclient-dev \ php7.4 \ php7.4-dev \ php7.4-fpm \ @@ -70,7 +67,14 @@ RUN cd ${MAKE_DIR} && \ make && \ make test && \ make install && \ - cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} + + +################################################################## +# compilling smbclient +################################################################## +RUN pecl install smbclient && \ + cp ${PHP_MODULE_PATH}/smbclient.so ${EXPORT_DIR} ################################################################## ################################################################## @@ -84,14 +88,11 @@ ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ARG PHP_VER=7.4 ARG PHP_DIR=/etc/php/${PHP_VER} ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini ################################################################## # Installing PHP7 ################################################################## -#installing php repo -RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' - #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ @@ -102,42 +103,44 @@ RUN apt-get update && \ php7.4-cli \ php7.4-cgi \ php-pear \ - php-gmp \ - php-snmp \ - php-ldap \ - php-mail \ - php-soap \ - php-mysql \ - php-memcached \ - php-memcache \ - php-igbinary \ - php-interbase \ - php-curl \ - php-gd \ - php-intl \ - php-zip \ - php-bcmath \ - php-imap \ - php-pspell \ - php-sqlite3 \ - php-tidy \ - php-xmlrpc \ - php-xml \ - php-mbstring \ - php-apcu \ - php-common \ - php-json \ - php-readline \ - php-enchant \ - php-ssh2 \ - php-oauth \ - php-gmagick \ - php-gnupg \ - php-redis \ - php-smbclient \ - php-yaml \ - php-geoip \ + php7.4-gmp \ + php7.4-snmp \ + php7.4-ldap \ + php7.4-mail \ + php7.4-soap \ + php7.4-mysql \ + php7.4-memcached \ + php7.4-memcache \ + php7.4-igbinary \ + php7.4-interbase \ + php7.4-curl \ + php7.4-gd \ + php7.4-intl \ + php7.4-zip \ + php7.4-bcmath \ + php7.4-imap \ + php7.4-pspell \ + php7.4-sqlite3 \ + php7.4-tidy \ + php7.4-xmlrpc \ + php7.4-xml \ + php7.4-mbstring \ + php7.4-apcu \ + php7.4-common \ + php7.4-json \ + php7.4-readline \ + php7.4-enchant \ + php7.4-ssh2 \ + php7.4-oauth \ + php7.4-gmagick \ + php7.4-gnupg \ + php7.4-redis \ + smbclient libsmbclient \ +# php-smbclient \ + php7.4-yaml \ + php7.4-geoip \ sendmail && \ + update-alternatives --set php /usr/bin/php7.4 && \ phpenmod \ snmp \ gmp \ @@ -203,6 +206,17 @@ RUN echo "extension=perforce.so" > ${P4_PHP_INI} && \ php -m && \ php -v +################################################################## +# Installing smbclient addon +################################################################## +COPY --from=builder /builds/export/smbclient.so ${PHP_MODULE_PATH} +RUN echo "extension=smbclient.so" > ${SMB_PHP_INI} && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cgi/conf.d/smbclient.ini && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cli/conf.d/smbclient.ini && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/fpm/conf.d/smbclient.ini && \ + php -m && \ + php -v + ################################################################## # Installing Composer addon ################################################################## diff --git a/php/php7.4/Dockerfile b/php/php7.4/Dockerfile index 6fad82245..aa52f1c23 100644 --- a/php/php7.4/Dockerfile +++ b/php/php7.4/Dockerfile @@ -20,7 +20,7 @@ ARG P4API_URL=https://www.perforce.com/downloads/perforce/${P4API_VER}/bin.linux ARG P4PHP_VER=r20.1 ARG P4PHP_URL=https://www.perforce.com/downloads/perforce/${P4PHP_VER}/bin.tools/p4php-php7.tgz -ARG P4MODULE_PATH=/usr/lib/php/20190902 +ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ################################################################## # Files and folders @@ -30,14 +30,11 @@ RUN mkdir -p ${BUILDS_DIR} ${SRC_DIR} ${EXPORT_DIR} ${MAKE_DIR} ${P4API_DIR} ${P ################################################################## # Installing PHP7 ################################################################## -#installing php repo -RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' - #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ + smbclient libsmbclient libsmbclient-dev \ php7.4 \ php7.4-dev \ php7.4-fpm \ @@ -70,7 +67,14 @@ RUN cd ${MAKE_DIR} && \ make && \ make test && \ make install && \ - cp ${P4MODULE_PATH}/perforce.so ${EXPORT_DIR} + cp ${PHP_MODULE_PATH}/perforce.so ${EXPORT_DIR} + + +################################################################## +# compilling smbclient +################################################################## +RUN pecl install smbclient && \ + cp ${PHP_MODULE_PATH}/smbclient.so ${EXPORT_DIR} ################################################################## ################################################################## @@ -84,14 +88,11 @@ ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ARG PHP_VER=7.4 ARG PHP_DIR=/etc/php/${PHP_VER} ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini ################################################################## # Installing PHP7 ################################################################## -#installing php repo -RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg -RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list' - #Install base packages RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ @@ -102,42 +103,44 @@ RUN apt-get update && \ php7.4-cli \ php7.4-cgi \ php-pear \ - php-gmp \ - php-snmp \ - php-ldap \ - php-mail \ - php-soap \ - php-mysql \ - php-memcached \ - php-memcache \ - php-igbinary \ - php-interbase \ - php-curl \ - php-gd \ - php-intl \ - php-zip \ - php-bcmath \ - php-imap \ - php-pspell \ - php-sqlite3 \ - php-tidy \ - php-xmlrpc \ - php-xml \ - php-mbstring \ - php-apcu \ - php-common \ - php-json \ - php-readline \ - php-enchant \ - php-ssh2 \ - php-oauth \ - php-gmagick \ - php-gnupg \ - php-redis \ - php-smbclient \ - php-yaml \ - php-geoip \ + php7.4-gmp \ + php7.4-snmp \ + php7.4-ldap \ + php7.4-mail \ + php7.4-soap \ + php7.4-mysql \ + php7.4-memcached \ + php7.4-memcache \ + php7.4-igbinary \ + php7.4-interbase \ + php7.4-curl \ + php7.4-gd \ + php7.4-intl \ + php7.4-zip \ + php7.4-bcmath \ + php7.4-imap \ + php7.4-pspell \ + php7.4-sqlite3 \ + php7.4-tidy \ + php7.4-xmlrpc \ + php7.4-xml \ + php7.4-mbstring \ + php7.4-apcu \ + php7.4-common \ + php7.4-json \ + php7.4-readline \ + php7.4-enchant \ + php7.4-ssh2 \ + php7.4-oauth \ + php7.4-gmagick \ + php7.4-gnupg \ + php7.4-redis \ + smbclient libsmbclient \ +# php-smbclient \ + php7.4-yaml \ + php7.4-geoip \ sendmail && \ + update-alternatives --set php /usr/bin/php7.4 && \ phpenmod \ snmp \ gmp \ @@ -203,6 +206,17 @@ RUN echo "extension=perforce.so" > ${P4_PHP_INI} && \ php -m && \ php -v +################################################################## +# Installing smbclient addon +################################################################## +COPY --from=builder /builds/export/smbclient.so ${PHP_MODULE_PATH} +RUN echo "extension=smbclient.so" > ${SMB_PHP_INI} && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cgi/conf.d/smbclient.ini && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/cli/conf.d/smbclient.ini && \ + ln -sf ${SMB_PHP_INI} ${PHP_DIR}/fpm/conf.d/smbclient.ini && \ + php -m && \ + php -v + ################################################################## # Installing Composer addon ################################################################## diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile index 15af026fb..70697da92 100644 --- a/websites/latest/Dockerfile +++ b/websites/latest/Dockerfile @@ -6,6 +6,7 @@ ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ARG PHP_VER=7.4 ARG PHP_DIR=/etc/php/${PHP_VER} ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini ################################################################## # Installing Apache2 @@ -22,8 +23,7 @@ RUN apt-get update && \ libapache2-mod-php7.4 \ libapache2-mod-webauth \ libapache2-mod-xforward \ - libapache2-mod-security2 \ - libmemcached-dev && \ + libapache2-mod-security2 && \ a2enmod \ php7.4 \ rewrite \ @@ -66,6 +66,13 @@ RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ php -m && \ php -v +################################################################## +# Installing smbclient addon +################################################################## +RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ + php -m && \ + php -v + ################################################################## # cleaninig up ################################################################## diff --git a/websites/php7.4/Dockerfile b/websites/php7.4/Dockerfile index 6ecb9504f..70697da92 100644 --- a/websites/php7.4/Dockerfile +++ b/websites/php7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/php:php7.4 +FROM epicmorg/php:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -6,6 +6,7 @@ ARG PHP_MODULE_PATH=/usr/lib/php/20190902 ARG PHP_VER=7.4 ARG PHP_DIR=/etc/php/${PHP_VER} ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini +ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini ################################################################## # Installing Apache2 @@ -22,8 +23,7 @@ RUN apt-get update && \ libapache2-mod-php7.4 \ libapache2-mod-webauth \ libapache2-mod-xforward \ - libapache2-mod-security2 \ - libmemcached-dev && \ + libapache2-mod-security2 && \ a2enmod \ php7.4 \ rewrite \ @@ -66,6 +66,13 @@ RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \ php -m && \ php -v +################################################################## +# Installing smbclient addon +################################################################## +RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \ + php -m && \ + php -v + ################################################################## # cleaninig up ################################################################## From cb468dbbaf68c2996c9e76be8aa6b920763597d5 Mon Sep 17 00:00:00 2001 From: Odmin Date: Thu, 11 Mar 2021 01:28:20 +0300 Subject: [PATCH 6/6] atlassian updates --- atlassian/bitbucket/latest/Dockerfile | 2 +- atlassian/bitbucket/latest/Dockerfile.jdk11 | 2 +- atlassian/confluence/latest/Dockerfile | 2 +- atlassian/confluence/latest/Dockerfile.jdk11 | 2 +- atlassian/fisheye-crucible/latest/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile index 1889390c8..77f0e489e 100644 --- a/atlassian/bitbucket/latest/Dockerfile +++ b/atlassian/bitbucket/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=7.9.1 +ARG BITBUCKET_VERSION=7.11.1 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz ################################################################## diff --git a/atlassian/bitbucket/latest/Dockerfile.jdk11 b/atlassian/bitbucket/latest/Dockerfile.jdk11 index 0258acb5b..f99d76d7d 100644 --- a/atlassian/bitbucket/latest/Dockerfile.jdk11 +++ b/atlassian/bitbucket/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG BITBUCKET_VERSION=7.9.1 +ARG BITBUCKET_VERSION=7.11.1 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz ################################################################## diff --git a/atlassian/confluence/latest/Dockerfile b/atlassian/confluence/latest/Dockerfile index 91ea61817..34de29db3 100644 --- a/atlassian/confluence/latest/Dockerfile +++ b/atlassian/confluence/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.10.2 +ARG CONFLUENCE_VERSION=7.11.1 ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/atlassian/confluence/latest/Dockerfile.jdk11 b/atlassian/confluence/latest/Dockerfile.jdk11 index e8c3ddd99..5e6a64ebe 100644 --- a/atlassian/confluence/latest/Dockerfile.jdk11 +++ b/atlassian/confluence/latest/Dockerfile.jdk11 @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG CONFLUENCE_VERSION=7.10.2 +ARG CONFLUENCE_VERSION=7.11.1 ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz ################################################################## diff --git a/atlassian/fisheye-crucible/latest/Dockerfile b/atlassian/fisheye-crucible/latest/Dockerfile index f956ea04c..8ef319b91 100644 --- a/atlassian/fisheye-crucible/latest/Dockerfile +++ b/atlassian/fisheye-crucible/latest/Dockerfile @@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive ################################################################## # ARGuments ################################################################## -ARG FECRU_VERSION=4.8.5 +ARG FECRU_VERSION=4.8.6 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/fisheye/downloads/fisheye-${FECRU_VERSION}.zip ##################################################################