Merge branch 'develop'

EpicMorg · Jan 27, 2021 · a168e03 · a168e03
2 parents 380efdb + f5202f7
commit a168e03
Show file tree

Hide file tree

Showing 45 changed files with 1,282 additions and 2,622 deletions.
diff --git a/.github/workflows/docker-develop.yml b/.github/workflows/docker-develop.yml
@@ -64,9 +64,6 @@ jobs:
     - name: Build NextCloud (20)
       run:  docker build --compress -t epicmorg/nextcloud:20 nextcloud/20
 
-    - name: Build sysPass + php7.4 (latest)
-      run:  docker build --compress -t epicmorg/syspass:latest syspass/sysPass
-
 ######################################################################################################################################################
 
 #########################################
@@ -152,6 +149,18 @@ jobs:
     - name: Build NGinx + RTMP-HLS
       run:  docker build --compress -t epicmorg/balancer:rtmp-hls balancer/rtmp-hls
 
+    - name: PHP (latest)
+      run:  docker build --compress -t epicmorg/php:latest php/latest
+
+    - name: PHP 7.4
+      run:  docker build --compress -t epicmorg/php:php7.4 php/php7.4
+
+    - name: PHP 7.3
+      run:  docker build --compress -t epicmorg/php:php7.3 php/php7.3
+
+    - name: PHP 7.2
+      run:  docker build --compress -t epicmorg/php:php7.2 php/php7.2
+
     - name: Build Apache (latest)
       run:  docker build --compress -t epicmorg/websites:latest websites/latest
 

diff --git a/.github/workflows/docker-master.yml b/.github/workflows/docker-master.yml
@@ -64,11 +64,6 @@ jobs:
     - name: Push TeamCity Server (latest)
       run:  docker push epicmorg/teamcity-server:latest
 
-    - name: Build sysPass + php7.4 (latest)
-      run:  docker build --compress -t epicmorg/syspass:latest syspass/sysPass
-    - name: Push sysPass + php7.4 (latest)
-      run:  docker push epicmorg/syspass:latest
-
     - name: Build MatterMost (latest)
       run:  docker build --compress -t epicmorg/mattermost-enterprise-edition:latest mattermost/latest
     - name: Push MatterMost (latest)
@@ -233,6 +228,13 @@ jobs:
     - name: Push Apache (latest)
       run:  docker push epicmorg/websites:latest
 
+
+    - name: PHP (latest)
+      run:  docker build --compress -t epicmorg/php:latest php/latest
+    - name: Push PHP (latest)
+      run:  docker push epicmorg/php:latest
+
+
     - name: Build NGinx (latest)
       run:  docker build --compress -t epicmorg/balancer:latest balancer/latest
     - name: Push NGinx (latest)
@@ -301,6 +303,21 @@ jobs:
     - name: Push NGinx + RTMP-HLS
       run:  docker push epicmorg/balancer:rtmp-hls
 
+    - name: PHP 7.4
+      run:  docker build --compress -t epicmorg/php:php7.4 php/php7.4
+    - name: Push PHP 7.4
+      run:  docker push epicmorg/php:7.4
+
+    - name: PHP 7.3
+      run:  docker build --compress -t epicmorg/php:php7.3 php/php7.3
+    - name: Push PHP 7.3
+      run:  docker push epicmorg/php:7.3
+
+    - name: PHP 7.2
+      run:  docker build --compress -t epicmorg/php:php7.2 php/php7.2
+    - name: Push PHP 7.2
+      run:  docker push epicmorg/php:7.2
+
     - name: Build Apache + PHP7.4
       run:  docker build --compress -t epicmorg/websites:php7.4 websites/php7.4
     - name: Push Apache + PHP7.4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,15 @@
 ## Changelog
+### 2021
+* `january`
+	* splitted `php` from `websites` images. all versions - `7.2-7.4`.
+	* updated `ioncube loader` for `php7.4`. enabled by degault.
+	* added support of `p4php` module. for all versions. enabled by degault.
+	* updated `atlassian` images.
+	* deprecated `syspass` iamge. sorry.
+	* updated `nginx`. and reworked `php` image, now it based in splitted php-image. yay.
+	* updated `teamcity agent` image.
+-------------------------------------------------------------------
+### 2020
 * `december`
 	* added mattermost
 	* fixed some images

diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile
@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG BITBUCKET_VERSION=7.8.0
+ARG BITBUCKET_VERSION=7.9.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
@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG BITBUCKET_VERSION=7.8.0
+ARG BITBUCKET_VERSION=7.9.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
@@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG CONFLUENCE_VERSION=7.9.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
+ARG CONFLUENCE_VERSION=7.10.2
+ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
 
 ##################################################################
 #                   Setup
@@ -33,7 +33,6 @@ RUN mkdir -p                             ${CONFLUENCE_INSTALL_DIR} \
     && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_INSTALL_DIR}/ \
     && sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
     && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
     update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
     apt clean -y && \
     apt autoclean -y && \

diff --git a/atlassian/confluence/latest/Dockerfile.jdk11 b/atlassian/confluence/latest/Dockerfile.jdk11
@@ -5,8 +5,8 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG CONFLUENCE_VERSION=7.9.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
+ARG CONFLUENCE_VERSION=7.10.2
+ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
 
 ##################################################################
 #                   Setup

diff --git 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.1
+ARG FECRU_VERSION=4.8.5
 ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/fisheye/downloads/fisheye-${FECRU_VERSION}.zip
 
 ##################################################################

diff --git a/atlassian/jira/latest/Dockerfile b/atlassian/jira/latest/Dockerfile
@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG JIRA_VERSION=8.14.0
+ARG JIRA_VERSION=8.14.1
 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
 
 ##################################################################

diff --git a/atlassian/jira/latest/Dockerfile.jdk11 b/atlassian/jira/latest/Dockerfile.jdk11
@@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG JIRA_VERSION=8.14.0
+ARG JIRA_VERSION=8.14.1
 ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
 
 ##################################################################

diff --git 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.5
+ARG NGINX_VERSION=1.19.6
 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
@@ -151,7 +151,7 @@ RUN cd ${NGINX_SRC_DIR} && \
     --add-dynamic-module=nginx-audio-track-for-hls-module \
     --add-dynamic-module=ip2location-nginx \
     --add-dynamic-module=nginx-vod-module \
-    --add-dynamic-module=nginx-module-vts \
+#    --add-dynamic-module=nginx-module-vts \
     --add-dynamic-module=mod-zip \
     --add-dynamic-module=nginx-http-user-agent \
     --add-dynamic-module=nginx-unzip-module \
@@ -163,7 +163,6 @@ RUN cd ${NGINX_SRC_DIR} && \
     --add-dynamic-module=http-lua && \
     cp -fv ${PRE_DIR}/nginx-description-pak ${NGINX_SRC_DIR}/description-pak && \
     fakeroot checkinstall -D --pakdir=/builds/export --maintainer="EpicMorg, [email protected]" --pkgname=nginx-custom  --install=no -y && \
-
     apt clean -y && \
     apt autoclean -y && \
     rm -rfv /var/lib/apt/lists/* && \
@@ -211,7 +210,6 @@ RUN apt-get update && \
     ln -sf /dev/stdout /var/log/nginx/access.log && \
     ln -sf /dev/stderr /var/log/nginx/error.log && \
     ln -sf /etc/ssl/dhparam.pem /etc/nginx/dhparam.pem && \
-
     apt clean -y && \
     apt autoclean -y && \
     rm -rf /var/lib/apt/lists/* && \