.github/workflows/_disabled/docker-linux-develop.yml.txt

@@ -17,12 +17,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##########
 
     - name: Build Zabbix Agent
@@ -91,12 +88,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##########
 
     - name: Build Base Production
@@ -178,16 +172,16 @@ jobs:
       run: docker system prune --all --force --volumes
 
     - name: PHP (latest)
-      run:  docker build --compress -t epicmorg/debian:bookworm-latest linux/php/latest
+      run:  docker build --compress -t epicmorg/php:latest linux/php/latest
 
     - name: PHP 7.4
-      run:  docker build --compress -t epicmorg/debian:bookworm-php7.4 linux/php/php7.4
+      run:  docker build --compress -t epicmorg/php:php7.4 linux/php/php7.4
 
     - name: PHP 7.3
-      run:  docker build --compress -t epicmorg/debian:bookworm-php7.3 linux/php/php7.3
+      run:  docker build --compress -t epicmorg/php:php7.3 linux/php/php7.3
 
     - name: PHP 7.2
-      run:  docker build --compress -t epicmorg/debian:bookworm-php7.2 linux/php/php7.2
+      run:  docker build --compress -t epicmorg/php:php7.2 linux/php/php7.2
 
     - name: Cleanup
       run: docker system prune --all --force --volumes

.github/workflows/_disabled/docker-linux-master.yml.txt

@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - 'master'
-#  schedule:
-#    - cron:  '00 00 * * 6' # At 12:00 AM, only on Saturday
+  schedule:
+    - cron:  '00 00 * * 6' # At 12:00 AM, only on Saturday
 
 jobs:
 
@@ -24,12 +24,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Zabbix Agent
@@ -85,12 +82,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Base Production
@@ -131,12 +125,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Base Edge
@@ -178,12 +169,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Base Develop
@@ -225,18 +213,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: PHP (latest)
-      run:  docker build --compress -t epicmorg/debian:bookworm-latest linux/php/latest
+      run:  docker build --compress -t epicmorg/php:latest linux/php/latest
     - name: Push PHP (latest)
-      run:  docker push epicmorg/debian:bookworm-latest
+      run:  docker push epicmorg/php:latest
 
     - name: Build Apache (latest)
       run:  docker build --compress -t epicmorg/apache2:latest linux/apache2/latest
@@ -287,12 +272,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Testrail (always latest)
@@ -314,12 +296,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Nginx + PHP7.4
@@ -343,19 +322,19 @@ jobs:
              docker push epicmorg/balancer:rtmp-hls
 
     - name: PHP 7.4
-      run:  docker build --compress -t epicmorg/debian:bookworm-php7.4 linux/php/php7.4
+      run:  docker build --compress -t epicmorg/php:php7.4 linux/php/php7.4
     - name: Push PHP 7.4
-      run:  docker push epicmorg/debian:bookworm-php7.4
+      run:  docker push epicmorg/php:php7.4
 
     - name: PHP 7.3
-      run:  docker build --compress -t epicmorg/debian:bookworm-php7.3 linux/php/php7.3
+      run:  docker build --compress -t epicmorg/php:php7.3 linux/php/php7.3
     - name: Push PHP 7.3
-      run:  docker push epicmorg/debian:bookworm-php7.3
+      run:  docker push epicmorg/php:php7.3
 
     - name: PHP 7.2
-      run:  docker build --compress -t epicmorg/debian:bookworm-php7.2 linux/php/php7.2
+      run:  docker build --compress -t epicmorg/php:php7.2 linux/php/php7.2
     - name: Push PHP 7.2
-      run:  docker push epicmorg/debian:bookworm-php7.2
+      run:  docker push epicmorg/php:php7.2
 
     - name: Cleanup
       run: docker system prune --all --force --volumes
@@ -404,12 +383,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Bitbucket + JDK 8 (latest)
@@ -436,12 +412,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Confluence + JDK 8 (latest)
@@ -468,12 +441,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Jira + JDK 8 (latest)
@@ -500,12 +470,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build Fisheye + Crucible + JDK 8 (latest)
@@ -527,12 +494,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build qBitTorrent (latest)
@@ -564,12 +528,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build PostgresSQL (8.2)
@@ -655,12 +616,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
     - name: Build NextCloud (14)
@@ -720,12 +678,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Bitbucket xxx + JDK 8
@@ -1477,12 +1432,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Bitbucket xxx + JDK 8
@@ -1639,12 +1591,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
  
 #    - name: Build Confluence xxx + JDK 7
@@ -1681,12 +1630,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Confluence xxx + JDK 8
@@ -2254,12 +2200,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Confluence xxx + JDK 8
@@ -2466,12 +2409,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Jira xxx + JDK 6
@@ -2493,12 +2433,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Jira xxx + JDK 7
@@ -2530,12 +2467,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Jira xxx + JDK 8
@@ -3134,12 +3068,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
 ##################################################################################
 
 #    - name: Build Jira xxx + JDK 8

.github/workflows/_disabled/docker-win32-develop.yml.txt

@@ -19,12 +19,9 @@ jobs:
  
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
     - name: Get Experimental Status
       run: |
           docker version -f '{{.Server.Experimental}}'

.github/workflows/_disabled/docker-win32-master.yml.txt

@@ -4,8 +4,8 @@ on:
   push:
     branches:
       - 'master'
-#  schedule:
-#    - cron:  '00 00 * * 6' # At 12:00 AM, only on Saturday
+  schedule:
+    - cron:  '00 00 * * 6' # At 12:00 AM, only on Saturday
 
 jobs:
 
@@ -28,12 +28,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
     - name: Get Experimental Status
       run: |
           docker version -f '{{.Server.Experimental}}'

.github/workflows/_disabled/epicmorg.advanced.python.yml.txt

@@ -2,8 +2,8 @@ name: EpicMorg Advanced Debian Python Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '1 1 * * 1,3,5'
+  schedule:
+    - cron:  '1 1 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -37,7 +29,7 @@ jobs:
       run:  cd linux/advanced/python/main/3.6    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
     - name: "Build and Deploy Python 3.7 Main Image:"
       run:  cd linux/advanced/python/main/3.7    && pwd && make build && make deploy
@@ -46,7 +38,7 @@ jobs:
       run:  cd linux/advanced/python/main/3.8    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
     - name: "Build and Deploy Python 3.9 Main Image:"
       run:  cd linux/advanced/python/main/3.9    && pwd && make build && make deploy
@@ -55,7 +47,7 @@ jobs:
       run:  cd linux/advanced/python/main/3.10    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
     - name: "Build and Deploy Python 3.11 Main Image:"
       run:  cd linux/advanced/python/main/3.11    && pwd && make build && make deploy
@@ -67,7 +59,7 @@ jobs:
       run:  cd linux/advanced/python/main/3.13    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -78,17 +70,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -102,7 +86,7 @@ jobs:
       run:  cd linux/advanced/python/develop/3.6    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 
     - name: "Build and Deploy Python 3.7 Develop Image:"
@@ -112,7 +96,7 @@ jobs:
       run:  cd linux/advanced/python/develop/3.8    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
     - name: "Build and Deploy Python 3.9 Develop Image:"
       run:  cd linux/advanced/python/develop/3.9    && pwd && make build && make deploy
@@ -121,7 +105,7 @@ jobs:
       run:  cd linux/advanced/python/develop/3.10    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 
     - name: "Build and Deploy Python 3.11 Develop Image:"
@@ -131,7 +115,7 @@ jobs:
       run:  cd linux/advanced/python/develop/3.12    && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
     - name: "Build and Deploy Python 3.13 Develop Image:"
       run:  cd linux/advanced/python/develop/3.13    && pwd && make build && make deploy
@@ -139,4 +123,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/_disabled/epicmorg.ecosysctem.freegpt.images.yml.txt

@@ -1,8 +1,8 @@
 name:  EpicMorg EcoSystem FreeGPT Images
 
 on:
-#  schedule:
-#    - cron:  '0 0 * * 2,4,6'
+  schedule:
+    - cron:  '0 0 * * 2,4,6'
 
 jobs:
 
@@ -14,17 +14,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -41,7 +33,7 @@ jobs:
       run:  cd linux/ecosystem/freegpt-webui/1.2 && make build && make deploy
           
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
     - name: Build and Deploy freegpt-webui 1.3
       run:  cd linux/ecosystem/freegpt-webui/1.3 && make build && make deploy
@@ -53,7 +45,7 @@ jobs:
       run:  cd linux/ecosystem/freegpt-webui/1.3.2 && make build && make deploy
           
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
     - name: Build and Deploy freegpt-webui 1.4
       run:  cd linux/ecosystem/freegpt-webui/1.4 && make build && make deploy
@@ -63,4 +55,4 @@ jobs:
 
 ##################################################################################
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.advanced.images.yml

@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -34,11 +26,11 @@ jobs:
       run:  cd linux/advanced/mattermost && pwd && make build && make deploy
 
     - name: "Build and Deploy Advanced Teamcity Server Image:"
-      run:  cd linux/advanced/teamcity/server/latest && pwd && make build && make deploy
+      run:  cd linux/advanced/teamcity/server && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################

.github/workflows/epicmorg.advanced.nextcloud.images.yml

@@ -13,67 +13,59 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
     - name: Install requirements.txt
       run:  make pip
 
-#    - name: "Build and Deploy Advanced Nextcloud 14 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/14 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 15 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/15 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 16 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/16 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 17 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/17 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 18 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/18 && pwd && make build && make deploy
-#    
-#    - name: Cleanup
-#      run: make clean
-#
-#    - name: "Build and Deploy Advanced Nextcloud 19 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/19 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 20 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/20 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 21 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/21 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 22 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/22 && pwd && make build && make deploy
-#    
-#    - name: Cleanup
-#      run: make clean
-#
-#    - name: "Build and Deploy Advanced Nextcloud 23 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/23 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 24 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/24 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 25 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/25 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 26 Stock Images:"
-#      run:  cd linux/advanced/nextcloud/pure/26 && pwd && make build && make deploy
+    - name: "Build and Deploy Advanced Nextcloud 14 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/14 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 15 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/15 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 16 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/16 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 17 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/17 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 18 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/18 && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy Advanced Nextcloud 19 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/19 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 20 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/20 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 21 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/21 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 22 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/22 && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy Advanced Nextcloud 23 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/23 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 24 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/24 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 25 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/25 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 26 Stock Images:"
+      run:  cd linux/advanced/nextcloud/pure/26 && pwd && make build && make deploy
 
     - name: "Build and Deploy Advanced Nextcloud 27 Stock Images:"
       run:  cd linux/advanced/nextcloud/pure/27 && pwd && make build && make deploy
@@ -91,7 +83,7 @@ jobs:
       run:  cd linux/advanced/nextcloud/pure/latest && pwd && make build && make deploy
     
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -101,67 +93,59 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
     - name: Install requirements.txt
       run:  make pip
 
-#    - name: "Build and Deploy Advanced Nextcloud 14 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/14 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 15 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/15 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 16 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/16 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 17 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/17 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 18 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/18 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 19 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/19 && pwd && make build && make deploy
-#    
-#    - name: Cleanup
-#      run: make clean
-#
-#    - name: "Build and Deploy Advanced Nextcloud 20 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/20 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 21 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/21 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 22 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/22 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 23 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/23 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 24 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/24 && pwd && make build && make deploy
-#    
-#    - name: Cleanup
-#      run: make clean
-#
-#    - name: "Build and Deploy Advanced Nextcloud 25 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/25 && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Advanced Nextcloud 26 Patched Images:"
-#      run:  cd linux/advanced/nextcloud/patched/26 && pwd && make build && make deploy
+    - name: "Build and Deploy Advanced Nextcloud 14 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/14 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 15 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/15 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 16 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/16 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 17 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/17 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 18 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/18 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 19 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/19 && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy Advanced Nextcloud 20 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/20 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 21 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/21 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 22 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/22 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 23 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/23 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 24 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/24 && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy Advanced Nextcloud 25 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/25 && pwd && make build && make deploy
+
+    - name: "Build and Deploy Advanced Nextcloud 26 Patched Images:"
+      run:  cd linux/advanced/nextcloud/patched/26 && pwd && make build && make deploy
 
     - name: "Build and Deploy Advanced Nextcloud 27 Patched Images:"
       run:  cd linux/advanced/nextcloud/patched/27 && pwd && make build && make deploy
@@ -181,4 +165,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.advanced.vscode.images.yml

@@ -13,18 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        echo 'unqualified-search-registries = ["docker.io"]' >> /etc/containers/registries.conf
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -48,7 +39,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -64,7 +55,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -80,6 +71,6 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################

.github/workflows/epicmorg.advanced.zabbix.images.yml

@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -68,17 +60,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -120,17 +104,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -172,17 +148,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -227,17 +195,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -282,17 +242,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -337,17 +289,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -392,17 +336,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -447,17 +383,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -502,17 +430,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -557,17 +477,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -607,4 +519,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.base.images.current.atlassian.yml

@@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Atlassian Main Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '5 5 * * 1,3,5'
+  schedule:
+    - cron:  '5 5 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -51,4 +43,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.base.images.debian.10.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian 10 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 1,3,5'
+  schedule:
+    - cron:  '0 0 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -44,7 +36,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -57,7 +49,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -70,7 +62,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -86,7 +78,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -99,7 +91,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -112,7 +104,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -148,7 +140,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -173,7 +165,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -201,7 +193,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 

.github/workflows/epicmorg.base.images.debian.11.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian 11 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 1,3,5'
+  schedule:
+    - cron:  '0 0 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,47 +34,10 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
-    - name: "Build and Deploy Debian 11 LTS Python 3.9:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.9  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 11 LTS Python 3.10:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.10  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 11 LTS Python 3.11:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.11  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 11 LTS Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.12  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 11 LTS Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/11-bullseye/python/3.13  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-
     - name: "Build and Deploy Debian 11 LTS jdk6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk6    && pwd && make build && make deploy
       
@@ -92,7 +47,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -105,7 +60,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -115,20 +70,13 @@ jobs:
     - name: "Build and Deploy Debian 11 LTS jdk17 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk17    && pwd && make build && make deploy
       
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 LTS jdk18 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk18    && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -141,37 +89,20 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
     - name: "Build and Deploy Debian 11 LTS jdk21 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk21    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 LTS jdk22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk22    && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 11 LTS jdk23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/jdk/jdk23    && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -192,26 +123,12 @@ jobs:
     - name: "Build and Deploy Debian 11 NodeJS 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node5    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 NodeJS 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node6    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 11 NodeJS 7 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node7    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 NodeJS 8 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node8    && pwd && make build && make deploy
     
@@ -221,7 +138,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -234,13 +151,6 @@ jobs:
     - name: "Build and Deploy Debian 11 NodeJS 12 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node12    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 NodeJS 13 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node13    && pwd && make build && make deploy
 
@@ -253,7 +163,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -266,13 +176,6 @@ jobs:
     - name: "Build and Deploy Debian 11 NodeJS 18 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node18    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 NodeJS 19 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node19    && pwd && make build && make deploy
 
@@ -282,23 +185,13 @@ jobs:
     - name: "Build and Deploy Debian 11 NodeJS 21 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node21    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 NodeJS 22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node22    && pwd && make build && make deploy
 
-    - name: "Build and Deploy Debian 11 NodeJS 23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/nodejs/node23    && pwd && make build && make deploy
-
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -308,45 +201,17 @@ jobs:
     - name: "Build and Deploy Debian 11 dotNet STS Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/dotnet/sts    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 dotNet 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/dotnet/dotnet5    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 11 dotNet 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/dotnet/dotnet6    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 dotNet 7 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/dotnet/dotnet7    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 11 dotNet 8 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/dotnet/dotnet8    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 11 dotNet 9 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/11-bullseye/dotnet/dotnet9    && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################

.github/workflows/epicmorg.base.images.debian.12.yml

@@ -2,12 +2,8 @@ name: EpicMorg Debian 12 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 1,3,5'
-
-env:
-  BUILDAH_FORMAT: docker
-  BUILDAH_ISOLATION: docker
+  schedule:
+    - cron:  '0 0 * * 1,3,5'
 
 jobs:
 
@@ -17,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -46,92 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 12 Python 3.9:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.9  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 12 Python 3.10:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.10  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 12 Python 3.11:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.11  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 12 Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.12  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 12 Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/12-bookworm/python/3.13  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 12 PHP 5.6 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php5.6    && pwd && make build && make deploy
-    
-    - name: "Build and Deploy Debian 12 PHP 7.0 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0    && pwd && make build && make deploy
-    
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 12 PHP 7.1 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1    && pwd && make build && make deploy
-    
-    - name: "Build and Deploy Debian 12 PHP 7.2 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2    && pwd && make build && make deploy
-    
-    - name: "Build and Deploy Debian 12 PHP 7.3 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3    && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 12 PHP 7.4 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4    && pwd && make build && make deploy
-    
-    - name: "Build and Deploy Debian 12 PHP 8.0 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0    && pwd && make build && make deploy
-    
-    - name: "Build and Deploy Debian 12 PHP 8.1 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1    && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 12 PHP 8.2 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2    && pwd && make build && make deploy
-    
-    - name: "Build and Deploy Debian 12 PHP 8.3 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3    && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 12 PHP 8.4 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.4    && pwd && make build && make deploy
+      run: make docker-clean
 
 ##################################################################################
 
@@ -144,7 +47,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -157,7 +60,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -170,67 +73,36 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
     - name: "Build and Deploy Debian 12 jdk18 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk18    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 jdk19 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk19    && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
     - name: "Build and Deploy Debian 12 jdk20 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk20    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 jdk21 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk21    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 jdk22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk22    && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 12 jdk23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/jdk/jdk23    && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -251,13 +123,6 @@ jobs:
     - name: "Build and Deploy Debian 12 NodeJS 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node5    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 NodeJS 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node6    && pwd && make build && make deploy
 
@@ -273,7 +138,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -286,13 +151,6 @@ jobs:
     - name: "Build and Deploy Debian 12 NodeJS 12 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node12    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 NodeJS 13 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node13    && pwd && make build && make deploy
 
@@ -305,7 +163,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -318,13 +176,6 @@ jobs:
     - name: "Build and Deploy Debian 12 NodeJS 18 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node18    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 NodeJS 19 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node19    && pwd && make build && make deploy
 
@@ -337,13 +188,10 @@ jobs:
     - name: "Build and Deploy Debian 12 NodeJS 22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node22    && pwd && make build && make deploy
 
-    - name: "Build and Deploy Debian 12 NodeJS 23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/nodejs/node23    && pwd && make build && make deploy
-
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -356,35 +204,67 @@ jobs:
     - name: "Build and Deploy Debian 12 dotNet 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/dotnet/dotnet5    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 dotNet 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/dotnet/dotnet6    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 12 dotNet 7 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/dotnet/dotnet7    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 12 dotNet 8 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/dotnet/dotnet8    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 12 dotNet 9 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/dotnet/dotnet9    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
+# ##################################################################################
+# 
+# #    - name: "Build and Deploy Debian 12 PHP Latest Image:"
+# #      run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/latest    && pwd && make build && make deploy
+# 
+#     - name: "Build and Deploy Debian 12 PHP 7.0 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.0    && pwd && make build && make deploy
+#     
+#     - name: "Build and Deploy Debian 12 PHP 7.1 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.1    && pwd && make build && make deploy
+#     
+#     - name: "Build and Deploy Debian 12 PHP 7.2 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.2    && pwd && make build && make deploy
+#     
+#     - name: "Build and Deploy Debian 12 PHP 7.3 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.3    && pwd && make build && make deploy
+# 
+# ##################################################################################
+# 
+#     - name: Cleanup
+#       run: make docker-clean
+# 
+# ##################################################################################
+# 
+#     - name: "Build and Deploy Debian 12 PHP 7.4 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php7.4    && pwd && make build && make deploy
+#     
+#     - name: "Build and Deploy Debian 12 PHP 8.0 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.0    && pwd && make build && make deploy
+#     
+#     - name: "Build and Deploy Debian 12 PHP 8.1 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.1    && pwd && make build && make deploy
+# 
+# ##################################################################################
+# 
+#     - name: Cleanup
+#       run: make docker-clean
+# 
+# ##################################################################################
+# 
+#     - name: "Build and Deploy Debian 12 PHP 8.2 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.2    && pwd && make build && make deploy
+#     
+#     - name: "Build and Deploy Debian 12 PHP 8.3 Image:"
+#       run:  cd linux/ecosystem/epicmorg/debian/12-bookworm/php/php8.3    && pwd && make build && make deploy
+# 
+# ##################################################################################
+# 
+#     - name: Cleanup
+#       run: make docker-clean
+# 
+# ##################################################################################

.github/workflows/epicmorg.base.images.debian.13.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian 13 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '1 1 * * 1,3,5'
+  schedule:
+    - cron:  '1 1 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,43 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 13 Python 3.9:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.9  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 13 Python 3.10:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.10  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 13 Python 3.11:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.11  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 13 Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.12  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian 13 Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/13-trixie/python/3.13  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -91,7 +47,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -104,7 +60,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -117,7 +73,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -130,7 +86,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -140,30 +96,13 @@ jobs:
     - name: "Build and Deploy Debian 13 jdk21 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk21    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 jdk22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk22    && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian 13 jdk23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/13-trixie/jdk/jdk23    && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -184,26 +123,12 @@ jobs:
     - name: "Build and Deploy Debian 13 NodeJS 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node5    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 NodeJS 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node6    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 13 NodeJS 7 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node7    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 NodeJS 8 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node8    && pwd && make build && make deploy
     
@@ -213,7 +138,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -226,13 +151,6 @@ jobs:
     - name: "Build and Deploy Debian 13 NodeJS 12 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node12    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 NodeJS 13 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node13    && pwd && make build && make deploy
 
@@ -245,7 +163,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -261,13 +179,6 @@ jobs:
     - name: "Build and Deploy Debian 13 NodeJS 19 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node19    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 NodeJS 20 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node20    && pwd && make build && make deploy
 
@@ -277,13 +188,10 @@ jobs:
     - name: "Build and Deploy Debian 13 NodeJS 22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node22    && pwd && make build && make deploy
 
-    - name: "Build and Deploy Debian 13 NodeJS 23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/13-trixie/nodejs/node23    && pwd && make build && make deploy
-
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -293,39 +201,18 @@ jobs:
     - name: "Build and Deploy Debian 13 dotNet STS Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/dotnet/sts    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 dotNet 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet5    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 13 dotNet 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet6    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 dotNet 7 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet7    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian 13 dotNet 8 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet8    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian 13 dotNet 9 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/13-trixie/dotnet/dotnet9    && pwd && make build && make deploy
 
@@ -349,7 +236,7 @@ jobs:
 # ##################################################################################
 # 
 #     - name: Cleanup
-#       run: make clean
+#       run: make docker-clean
 # 
 # ##################################################################################
 # 
@@ -365,7 +252,7 @@ jobs:
 # ##################################################################################
 # 
 #     - name: Cleanup
-#       run: make clean
+#       run: make docker-clean
 # 
 # ##################################################################################
 # 
@@ -378,6 +265,6 @@ jobs:
 # ##################################################################################
 # 
 #     - name: Cleanup
-#       run: make clean
+#       run: make docker-clean
 # 
 # ##################################################################################

.github/workflows/epicmorg.base.images.debian.6.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian 6 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 1,3,5'
+  schedule:
+    - cron:  '0 0 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -43,7 +35,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -56,7 +48,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -69,7 +61,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -82,7 +74,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -95,7 +87,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -123,7 +115,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -136,6 +128,6 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################

.github/workflows/epicmorg.base.images.debian.7.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian 7 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 1,3,5'
+  schedule:
+    - cron:  '0 0 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,7 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -55,7 +47,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -68,7 +60,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -81,7 +73,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -94,7 +86,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -122,7 +114,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -135,6 +127,6 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################

.github/workflows/epicmorg.base.images.debian.8.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian 8 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 1,3,5'
+  schedule:
+    - cron:  '0 0 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,7 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -55,7 +47,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -68,7 +60,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
       
@@ -81,7 +73,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -94,7 +86,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -110,7 +102,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -138,7 +130,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -163,7 +155,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -176,7 +168,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 

.github/workflows/epicmorg.base.images.debian.9.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian 9 Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 1,3,5'
+  schedule:
+    - cron:  '0 0 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,7 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -58,7 +50,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -74,12 +66,12 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -95,7 +87,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -108,7 +100,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -136,7 +128,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -161,7 +153,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -174,6 +166,6 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################

.github/workflows/epicmorg.base.images.debian.sid.yml

@@ -2,8 +2,8 @@ name: EpicMorg Debian SID Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '2 2 * * 1,3,5'
+  schedule:
+    - cron:  '2 2 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,43 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian SID Python 3.9:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.9  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian SID Python 3.10:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.10  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian SID Python 3.11:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.11  && pwd && make build && make deploy
-
-    - name: "Build and Deploy Debian SID Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.12  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian SID Python 3.12:"
-      run:  	cd `pwd`/linux/ecosystem/epicmorg/debian/sid/python/3.13  && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -91,7 +47,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -104,7 +60,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -117,7 +73,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -130,47 +86,23 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
     - name: "Build and Deploy Debian SID jdk20 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/jdk/jdk20    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID jdk21 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/jdk/jdk21    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID jdk22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/jdk/jdk22    && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-    - name: "Build and Deploy Debian SID jdk23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/sid/jdk/jdk23    && pwd && make build && make deploy
-
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -191,13 +123,6 @@ jobs:
     - name: "Build and Deploy Debian SID NodeJS 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node5    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID NodeJS 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node6    && pwd && make build && make deploy
 
@@ -213,7 +138,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -226,13 +151,6 @@ jobs:
     - name: "Build and Deploy Debian SID NodeJS 12 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node12    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID NodeJS 13 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node13    && pwd && make build && make deploy
 
@@ -245,7 +163,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -258,13 +176,6 @@ jobs:
     - name: "Build and Deploy Debian SID NodeJS 18 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node18    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID NodeJS 19 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node19    && pwd && make build && make deploy
 
@@ -274,23 +185,13 @@ jobs:
     - name: "Build and Deploy Debian SID NodeJS 21 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node21    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID NodeJS 22 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node22    && pwd && make build && make deploy
 
-    - name: "Build and Deploy Debian SID NodeJS 23 Image:"
-      run:  cd linux/ecosystem/epicmorg/debian/sid/nodejs/node23    && pwd && make build && make deploy
-
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -300,39 +201,18 @@ jobs:
     - name: "Build and Deploy Debian SID dotNet STS Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/dotnet/sts    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID dotNet 5 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet5    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian SID dotNet 6 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet6    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID dotNet 7 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet7    && pwd && make build && make deploy
 
     - name: "Build and Deploy Debian SID dotNet 8 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet8    && pwd && make build && make deploy
 
-##################################################################################
-
-    - name: Cleanup
-      run: make clean
-
-##################################################################################
-
     - name: "Build and Deploy Debian SID dotNet 9 Image:"
       run:  cd linux/ecosystem/epicmorg/debian/sid/dotnet/dotnet9    && pwd && make build && make deploy
 
@@ -356,7 +236,7 @@ jobs:
 # ##################################################################################
 # 
 #     - name: Cleanup
-#       run: make clean
+#       run: make docker-clean
 # 
 # ##################################################################################
 # 
@@ -372,7 +252,7 @@ jobs:
 # ##################################################################################
 # 
 #     - name: Cleanup
-#       run: make clean
+#       run: make docker-clean
 # 
 # ##################################################################################
 # 
@@ -385,6 +265,6 @@ jobs:
 # ##################################################################################
 # 
 #     - name: Cleanup
-#       run: make clean
+#       run: make docker-clean
 # 
 # ##################################################################################

.github/workflows/epicmorg.base.images.giltab.runners.yml

@@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Gitlab Runner Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '4 5 * * 2,4,6'
+  schedule:
+    - cron:  '4 5 * * 2,4,6'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -33,226 +25,224 @@ jobs:
     - name: "Build and Deploy Gitlab Runner Main Image:"
       run:  cd linux/ecosystem/gitlab/runner/latest    && pwd && make build && make deploy
 
-###################################################################################
-#
-#  build-glr-other-images:
-#    name: Build EpicMorg Gitlab Runner Oter Images
-#    runs-on: ubuntu-24.04
-#    needs: build-glr-main-images
-#
-#    steps:
-#    - uses: actions/checkout@v4
-#    - name: Log into registry
-#      run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
-#
-#    - name: Check buildah
-#      run:  |
-#        buildah --version
-#        buildah info
-#
-#    - name: Test Make
-#      run:  make
-#
-#    - name: Install requirements.txt
-#      run:  make pip
-#
-#    - name: "Build and Deploy Gitlab Runner amxX 1.9 SDK Image:"
-#      run:  cd linux/ecosystem/gitlab/runner/amxx-sdk/1.9    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Gitlab Runner amxX 1.10 SDK Image:"
-#      run:  cd linux/ecosystem/gitlab/runner/amxx-sdk/1.10    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy Gitlab Runner Android SDK Image (jdk8):"
-#      run:  cd linux/ecosystem/gitlab/runner/android-sdk/jdk8    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy Gitlab Runner Android SDK Image (jdk11):"
-#      run:  cd linux/ecosystem/gitlab/runner/android-sdk/jdk11   && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy Gitlab Runner Android SDK Image (jdk17):"
-#      run:  cd linux/ecosystem/gitlab/runner/android-sdk/jdk17    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy Gitlab Runner Atlassian SDK Image:"
-#      run:  cd linux/ecosystem/gitlab/runner/atlassian-sdk    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy Gitlab Runner dotNet SDK Image:"
-#      run:  cd linux/ecosystem/gitlab/runner/dotnet-sdk    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Gitlab Runner node0.12 Image:"
-#      run:  cd linux/ecosystem/gitlab/runner/node0.12    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy Gitlab Runner node4 Image:"
-#      run:  cd linux/ecosystem/gitlab/runner/node4    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner node5 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node5    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node6 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node6    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node7 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node7    && pwd && make build && make deploy
-## 
-## ##################################################################################
-## 
-##     - name: Cleanup
-##       run: make clean
-## 
-## ##################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner node8 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node8    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node9 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node9    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node10 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node10    && pwd && make build && make deploy
-## 
-## ##################################################################################
-## 
-##     - name: Cleanup
-##       run: make clean
-## 
-## ##################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner node11 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node11    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node12 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node12    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node13 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node13    && pwd && make build && make deploy
-## 
-## ##################################################################################
-## 
-##     - name: Cleanup
-##       run: make clean
-## 
-## ##################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner node14 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node14    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node15 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node15    && pwd && make build && make deploy
-##     
-## 
-## ##################################################################################
-## 
-##     - name: Cleanup
-##       run: make clean
-## 
-## ##################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner node16 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node16    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node17 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node17    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node18 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node18    && pwd && make build && make deploy
-## 
-## ##################################################################################
-## 
-##     - name: Cleanup
-##       run: make clean
-## 
-## ##################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner node19 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node19    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner node20 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node20    && pwd && make build && make deploy
-##     
-##     - name: "Build and Deploy Gitlab Runner node21 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node21    && pwd && make build && make deploy
-##     
-##     - name: "Build and Deploy Gitlab Runner node22 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/node22    && pwd && make build && make deploy
-## 
-## ##################################################################################
-## 
-##     - name: Cleanup
-##       run: make clean
-## 
-## ##################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner php7.2 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/php7.2    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner php7.3 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/php7.3    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner php7.4 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/php7.4    && pwd && make build && make deploy
-##     
-## 
-## ##################################################################################
-## 
-##     - name: Cleanup
-##       run: make clean
-## 
-## ##################################################################################
-## 
-##     - name: "Build and Deploy Gitlab Runner php8.0 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/php8.0    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner php8.1 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/php8.1    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner php8.2 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/php8.2    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner php8.3 Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/php8.3    && pwd && make build && make deploy
-## 
-##     - name: "Build and Deploy Gitlab Runner Steam SDK Image:"
-##       run:  cd linux/ecosystem/gitlab/runner/steam-sdk    && pwd && make build && make deploy
-## 
-## ##################################################################################
-#
+##################################################################################
+
+  build-glr-other-images:
+    name: Build EpicMorg Gitlab Runner Oter Images
+    runs-on: ubuntu-24.04
+    needs: build-glr-main-images
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Log into registry
+      run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
+
+    - name: Test Make
+      run:  make
+
+    - name: Install requirements.txt
+      run:  make pip
+
+    - name: "Build and Deploy Gitlab Runner amxX 1.9 SDK Image:"
+      run:  cd linux/ecosystem/gitlab/runner/amxx-sdk/1.9    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner amxX 1.10 SDK Image:"
+      run:  cd linux/ecosystem/gitlab/runner/amxx-sdk/1.10    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner Android SDK Image (jdk8):"
+      run:  cd linux/ecosystem/gitlab/runner/android-sdk/jdk8    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner Android SDK Image (jdk11):"
+      run:  cd linux/ecosystem/gitlab/runner/android-sdk/jdk11   && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner Android SDK Image (jdk17):"
+      run:  cd linux/ecosystem/gitlab/runner/android-sdk/jdk17    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner Atlassian SDK Image:"
+      run:  cd linux/ecosystem/gitlab/runner/atlassian-sdk    && pwd && make build && make deploy
+    
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner dotNet SDK Image:"
+      run:  cd linux/ecosystem/gitlab/runner/dotnet-sdk    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node0.12 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node0.12    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node4 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node4    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner node5 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node5    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node6 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node6    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node7 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node7    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner node8 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node8    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node9 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node9    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node10 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node10    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner node11 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node11    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node12 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node12    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node13 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node13    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner node14 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node14    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node15 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node15    && pwd && make build && make deploy
+    
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner node16 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node16    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node17 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node17    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node18 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node18    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner node19 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node19    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner node20 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node20    && pwd && make build && make deploy
+    
+    - name: "Build and Deploy Gitlab Runner node21 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node21    && pwd && make build && make deploy
+    
+    - name: "Build and Deploy Gitlab Runner node22 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/node22    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner php7.2 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/php7.2    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner php7.3 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/php7.3    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner php7.4 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/php7.4    && pwd && make build && make deploy
+    
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean
+
+##################################################################################
+
+    - name: "Build and Deploy Gitlab Runner php8.0 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/php8.0    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner php8.1 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/php8.1    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner php8.2 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/php8.2    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner php8.3 Image:"
+      run:  cd linux/ecosystem/gitlab/runner/php8.3    && pwd && make build && make deploy
+
+    - name: "Build and Deploy Gitlab Runner Steam SDK Image:"
+      run:  cd linux/ecosystem/gitlab/runner/steam-sdk    && pwd && make build && make deploy
+
+##################################################################################
+
+    - name: Cleanup
+      run: make docker-clean

.github/workflows/epicmorg.base.images.perforce.yml

@@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Perfocre Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '4 4 * * 1,3,5'
+  schedule:
+    - cron:  '4 4 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,7 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -58,7 +50,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -74,7 +66,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -90,7 +82,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -112,17 +104,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -141,7 +125,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -160,7 +144,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -179,7 +163,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -198,4 +182,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.base.images.postgresql.yml

@@ -2,8 +2,8 @@ name: EpicMorg EcoSystem PostgreSQL Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '5 5 * * 1,3,5'
+  schedule:
+    - cron:  '5 5 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -42,7 +34,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -55,7 +47,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -66,7 +58,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -82,7 +74,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -95,7 +87,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -111,7 +103,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -133,4 +125,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.base.images.teamcity.agents.yml

@@ -2,8 +2,8 @@ name: EpicMorg EcoSystem TeamCity Agents Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '4 4 * * 2,4,6'
+  schedule:
+    - cron:  '4 4 * * 2,4,6'
 
 jobs:
 
@@ -13,28 +13,26 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
     - name: Install requirements.txt
       run:  make pip
 
-    - name: "Build and Deploy TeamCity Agent Minimal Image (jdk21):"
-      run:  cd linux/ecosystem/teamcity/agent/minimal && pwd && make build && make deploy
+    - name: "Build and Deploy TeamCity Agent Main Image (jdk8):"
+      run:  cd linux/ecosystem/teamcity/agent/latest/jdk8    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent Main Image (jdk11):"
+      run:  cd linux/ecosystem/teamcity/agent/latest/jdk11    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent Main Image (jdk17):"
+      run:  cd linux/ecosystem/teamcity/agent/latest/jdk17    && pwd && make build && make deploy
 
     - name: "Build and Deploy TeamCity Agent Main Image (jdk21):"
-      run:  cd linux/ecosystem/teamcity/agent/latest && pwd && make build && make deploy
+      run:  cd linux/ecosystem/teamcity/agent/latest/jdk21    && pwd && make build && make deploy
 
 ##################################################################################
 
@@ -45,199 +43,133 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
     - name: Install requirements.txt
       run:  make pip
 
-#    - name: "Build and Deploy TeamCity Agent amxX 1.9 SDK Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/amxx-sdk/1.9    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent amxX 1.10 SDK Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/amxx-sdk/1.10    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent Android SDK (jdk8) Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/android-sdk/jdk8    && pwd && make build && make deploy
-#    
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent Android SDK (jdk11) Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/android-sdk/jdk1    && pwd && make build && make deploy
-#    
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent Android SDK (jdk17) Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/android-sdk/jdk7    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent Atlassian SDK Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/atlassian-sdk    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent dotNet SDK Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/dotnet-sdk    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent node0.12 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node0.12    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node4 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node4    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node5 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node5    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node6 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node6    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent node7 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node7    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node8 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node8    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node9 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node9    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node10 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node10    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent node11 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node11    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node12 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node12    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node13 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node13    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node14 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node14    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent node15 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node15    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node16 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node16    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node17 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node17    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node18 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node18    && pwd && make build && make deploy
-#
-###################################################################################
-#
-#    - name: Cleanup
-#      run: make clean
-#
-###################################################################################
-#
-#    - name: "Build and Deploy TeamCity Agent node19 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node19    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node20 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node20    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node21 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node21    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent node22 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/node22    && pwd && make build && make deploy
+    - name: "Build and Deploy TeamCity Agent amxX 1.9 SDK Image:"
+      run:  cd linux/ecosystem/teamcity/agent/amxx-sdk/1.9    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent amxX 1.10 SDK Image:"
+      run:  cd linux/ecosystem/teamcity/agent/amxx-sdk/1.10    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent Android SDK (jdk8) Image:"
+      run:  cd linux/ecosystem/teamcity/agent/android-sdk/jdk8    && pwd && make build && make deploy
+    
+    - name: "Build and Deploy TeamCity Agent Android SDK (jdk11) Image:"
+      run:  cd linux/ecosystem/teamcity/agent/android-sdk/jdk1    && pwd && make build && make deploy
+    
+    - name: "Build and Deploy TeamCity Agent Android SDK (jdk17) Image:"
+      run:  cd linux/ecosystem/teamcity/agent/android-sdk/jdk7    && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy TeamCity Agent Atlassian SDK Image:"
+      run:  cd linux/ecosystem/teamcity/agent/atlassian-sdk    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent dotNet SDK Image:"
+      run:  cd linux/ecosystem/teamcity/agent/dotnet-sdk    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node0.12 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node0.12    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node4 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node4    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node5 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node5    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node6 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node6    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node7 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node7    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node8 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node8    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node9 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node9    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node10 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node10    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node11 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node11    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node12 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node12    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node13 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node13    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node14 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node14    && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy TeamCity Agent node15 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node15    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node16 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node16    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node17 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node17    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node18 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node18    && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy TeamCity Agent node19 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node19    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node20 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node20    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node21 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node21    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent node22 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/node22    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent php7.2 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/php7.2    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent php7.3 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/php7.3    && pwd && make build && make deploy
+    
+    - name: Cleanup
+      run: make docker-clean
+
+    - name: "Build and Deploy TeamCity Agent php7.4 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/php7.4    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent php8.0 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/php8.0    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent php8.1 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/php8.1    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent php8.2 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/php8.2    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent php8.3 Image:"
+      run:  cd linux/ecosystem/teamcity/agent/php8.3    && pwd && make build && make deploy
+
+    - name: "Build and Deploy TeamCity Agent Steam SDK Image:"
+      run:  cd linux/ecosystem/teamcity/agent/steam-sdk    && pwd && make build && make deploy
 
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
-
-##################################################################################
-
-#    - name: "Build and Deploy TeamCity Agent php7.2 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/php7.2    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent php7.3 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/php7.3    && pwd && make build && make deploy
-#    
-#    - name: Cleanup
-#      run: make clean
-#
-#    - name: "Build and Deploy TeamCity Agent php7.4 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/php7.4    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent php8.0 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/php8.0    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent php8.1 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/php8.1    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent php8.2 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/php8.2    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent php8.3 Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/php8.3    && pwd && make build && make deploy
-#
-#    - name: "Build and Deploy TeamCity Agent Steam SDK Image:"
-#      run:  cd linux/ecosystem/teamcity/agent/steam-sdk    && pwd && make build && make deploy
-#
-##################################################################################
+      run: make docker-clean

.github/workflows/epicmorg.base.images.testrail.yml

@@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Testrail Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '4 4 * * 1,3,5'
+  schedule:
+    - cron:  '4 4 * * 1,3,5'
 
 jobs:
 
@@ -14,17 +14,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -32,7 +24,7 @@ jobs:
       run:  make pip
 
     - name: "Build and Deploy Cassandra 3.11 Image:"
-      run:  cd linux/advanced/cassandra/3.11    && pwd && make build && make deploy
+      run:  cd linux/ecosystem/cassandra/3.11    && pwd && make build && make deploy
 
 ##################################################################################
 
@@ -43,17 +35,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -78,17 +62,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -108,4 +84,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.base.images.web.yml

@@ -2,8 +2,8 @@ name: EpicMorg EcoSystem Web Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '2 2 * * 1,3,5'
+  schedule:
+    - cron:  '2 2 * * 1,3,5'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -33,9 +25,6 @@ jobs:
 #    - name: "Build and Deploy Apache 2 Latest Image:"
 #      run:  cd linux/ecosystem/apache2/latest    && pwd && make build && make deploy
 
-    - name: "Build and Deploy Apache 2 + PHP 5.6 Image:"
-      run:  cd linux/ecosystem/apache2/php5.6    && pwd && make build && make deploy
-
     - name: "Build and Deploy Apache 2 + PHP 7.0 Image:"
       run:  cd linux/ecosystem/apache2/php7.0    && pwd && make build && make deploy
 
@@ -48,7 +37,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -64,7 +53,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -77,45 +66,42 @@ jobs:
     - name: "Build and Deploy Apache 2 + PHP 8.3 Image:"
       run:  cd linux/ecosystem/apache2/php8.3    && pwd && make build && make deploy
 
-    - name: "Build and Deploy Apache 2 + PHP 8.43 Image:"
-      run:  cd linux/ecosystem/apache2/php8.4    && pwd && make build && make deploy
+##################################################################################
 
-# ##################################################################################
-# 
-#   build-nginx-images:
-#     name: Build EpicMorg NginX Images
-#     runs-on: ubuntu-24.04
-# 
-#     steps:
-#     - uses: actions/checkout@v4
-#     - name: Log into registry
-#       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
-# 
-#     - name: Test Make
-#       run:  make
-# 
-#     - name: Install requirements.txt
-#       run:  make pip
-# 
-#     - name: "Build and Deploy NginX Image:"
-#       run:  cd linux/ecosystem/nginx/latest/mainline/main    && pwd && make build && make deploy
-# 
-#     - name: "Build and Deploy NginX + PHP7.4 Image:"
-#       run:  cd linux/ecosystem/nginx/latest/mainline/php     && pwd && make build && make deploy
-# 
-#     - name: "Build and Deploy NginX + RTMP-HLS Image:"
-#       run:  cd linux/ecosystem/nginx/latest/mainline/rtmp-hls    && pwd && make build && make deploy
-# 
-# #    - name: "Build and Deploy NginX (quic, http3) Image:"
-# #      run:  cd linux/ecosystem/nginx/latest/quic/main    && pwd && make build && make deploy
-# 
-# #    - name: "Build and Deploy NginX  (quic, http3) + PHP7.4 Image:"
-# #      run:  cd linux/ecosystem/nginx/latest/quic/php     && pwd && make build && make deploy
-# 
-# #    - name: "Build and Deploy NginX  (quic, http3) + RTMP-HLS Image:"
-# #      run:  cd linux/ecosystem/nginx/latest/quic/rtmp-hls    && pwd && make build && make deploy
-# 
-# ##################################################################################
+  build-nginx-images:
+    name: Build EpicMorg NginX Images
+    runs-on: ubuntu-24.04
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Log into registry
+      run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
+
+    - name: Test Make
+      run:  make
+
+    - name: Install requirements.txt
+      run:  make pip
+
+    - name: "Build and Deploy NginX Image:"
+      run:  cd linux/ecosystem/nginx/latest/mainline/main    && pwd && make build && make deploy
+
+    - name: "Build and Deploy NginX + PHP7.4 Image:"
+      run:  cd linux/ecosystem/nginx/latest/mainline/php     && pwd && make build && make deploy
+
+    - name: "Build and Deploy NginX + RTMP-HLS Image:"
+      run:  cd linux/ecosystem/nginx/latest/mainline/rtmp-hls    && pwd && make build && make deploy
+
+#    - name: "Build and Deploy NginX (quic, http3) Image:"
+#      run:  cd linux/ecosystem/nginx/latest/quic/main    && pwd && make build && make deploy
+
+#    - name: "Build and Deploy NginX  (quic, http3) + PHP7.4 Image:"
+#      run:  cd linux/ecosystem/nginx/latest/quic/php     && pwd && make build && make deploy
+
+#    - name: "Build and Deploy NginX  (quic, http3) + RTMP-HLS Image:"
+#      run:  cd linux/ecosystem/nginx/latest/quic/rtmp-hls    && pwd && make build && make deploy
+
+##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.ecosysctem.misc.images.yml

@@ -2,8 +2,8 @@ name:  EpicMorg EcoSystem Misc Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron:  '0 0 * * 2,4,6'
+  schedule:
+    - cron:  '0 0 * * 2,4,6'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -41,17 +33,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -69,17 +53,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -97,17 +73,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -129,7 +97,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -148,7 +116,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -164,7 +132,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -180,7 +148,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -199,7 +167,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -215,7 +183,7 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################
 
@@ -236,17 +204,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -264,17 +224,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -292,17 +244,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -323,17 +267,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -351,17 +287,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -379,17 +307,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -402,4 +322,4 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean

.github/workflows/epicmorg.experimental.images.yml

@@ -2,8 +2,8 @@ name: EpicMorg experimental Images
 
 on:
   workflow_dispatch:
-#  schedule:
-#    - cron: '0 01 * * 2,4,6'
+  schedule:
+    - cron: '0 01 * * 2,4,6'
 
 jobs:
 
@@ -13,17 +13,9 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Log into docker registry
+    - name: Log into registry
       run:  echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
 
-    - name: Log into harbor registry
-      run:  echo "${{ secrets.HARBOR_SERVER_KEY }}" | docker login -u "${{ secrets.HARBOR_SERVER_LOGIN }}" --password-stdin "${{ secrets.HARBOR_SERVER_URL }}"
-
-    - name: Check buildah
-      run:  |
-        buildah --version
-        buildah info
-
     - name: Test Make
       run:  make
 
@@ -39,6 +31,6 @@ jobs:
 ##################################################################################
 
     - name: Cleanup
-      run: make clean
+      run: make docker-clean
 
 ##################################################################################

.gitignore

@@ -1,5 +1,5 @@
 # Temp make file for local builds and debug
-*.temp
-*.tmp
+Makefile.temp 
 # debug ansible file
-*.log
+output.log
+output.*.log

CHANGELOG.md

@@ -1,91 +1,32 @@
 # Changelog
-* `apr`
-  * updated `opentracker`
-  * updated `retracker`
-  * updated `torrserver`
-  * udpated `vk2discord`
-  * updated `electron-release-server`
-  * updated `php` images with `ioncube` module.git a
-  * changed default docker regitstry hub to `own`. only for ci builds.
-  * updated `nodejs` 
-  * updated `jdk` 
-  * added new `openssl` version `3.5.0` `lts`
-  * added various versions of `cmake`
-  * updated `go`
-  * added more flutter compablity
-  * added `qbittorrent`
-  * added `nextcloud` version `31`
-  * updated `python`
-  * updated `gitlab-runner`
-## 2025
-* `mar`
-  * updated `teamcity-server` iamge
-  * added new `atlassian images`: `conflunece` 4 - 9, updated `jira` and `bitbucket`, added new `crowd` iamges.
-  * added new base images: `android-sdk` and `amxx-sdk`
-  * cleaned up `teamcity-agent` and `gitlab-runner` images
-  * updated `kaniko-wrapper` to `2.0.0.1`
-  * installed `buildah-wrapper` `0.0.0.2`
-  * Makefiles switched to `buildah` build runtime
-  * `GHA` switched to `buildah` build runtime
-  * updated `nodejs`, `jdk` base images
-* `feb`
-  * added `zabbix` images with `7.2` version
-  * added `OpenSSL` version `3.4.x` and `1.0.2u`.
-  * updated `OpenSSL` versions.
-  * created `python` base images.
-  * updated `nextcloud` images.
-  * fixed `sid` and `trixie` images.
-* `jan`
-  * updated `atlassian` images
-  * updated some deps in images:
-    * `cmake`, 
-    * `openssl`, 
-    * `jdk`,
-    * `nodejs`
-    * etc
-  * fixed building of `debian` `12`, `13`, `sid`:
-    * temprorary deprecated `boringssl` due compile issues. 
-      * also, current maintainer do not like google's `rolling` update politics.
 ## 2024
 * `dec`
-  * reworked `dhparam` regeneration in base images
-  * fixed `perforce` images
-  * new baseline:
-  * `qbittorrent`, `perforce`, `Atlassian Jira`, `Atlassian Bitbucket`, `TeamCity Agents`
-  * updated `Atlassian Images`:
-	* fixed old and added new versions of `Jira`
-	* fixed old and added new versions of `Bitbucket`
-  * updated `TeamCity Server` images
-  * temprary backported legacy `php` images and converted to new `baseline`:
-    * full migration to static `php` images planned at `2025y`.
-  * updated `nodejs` current and lts images.
-  * updated `testrail` images.
-  * reworked cleanup when building images
-  * Added **DONATION** and **WELCOME** messages to EpicMorg base images:
-    * To disable Welcome  message switch `EMG_WELCOME_MESSAGE`  to `false`
-    * To disable Donation message switch `EMG_DONATION_MESSAGE` to `false`
-
+	* migrated `qbittorrent` images to new baseline
+	* fixed `perforce` iamges and migrated to new baseline
+	* updated `Atlassian Images`:
+		* Migrated to new baseline all `Jira` iamges
+		* Updated to new versions of `Jira`
 * `sep`, `oct`, `nov`
-  * fixed some bugs in `Makefile`
-  * fixed `Dockerfile` bugs
-  * added `Nextcloud` version `30` in `tag`.
+	* fixed some bugs in `Makefile`
+	* fixed `Dockerfile` bugs
+	* added `Nextcloud` version `30` in `tag`.
 		
 * `aug`
-  * `sentry` and `redash` was set to `experimental` status bacause `ci` is not stable yet.
-  * reworked `teamcity:server` image.
-  * reworked `vscode` image.
-  * updated `monerod` and `p2pool` images to latest versions.
-  * updated `nodejs` and `jdk` images to latest versions.
-  * added extended `nodejs` and `jdk` base images support.
-  * added `dotnet` base images support.
-  * added `13-trixie` and `sid` - `Debian` base images support.
-  * fixed `Makefile`+ gha
-  * added support of `zabbix` version `7.0` + gha
-  * dropped `Astra CE\SE` due potencial license issues. Sorry.
-  * dropped `kaniko` local script instead of `pip` verion.
-  * added `Support Document for Docker Image Concepts in Project` document.
-  * backported new `CVE-fixed` versions of `atlassian` images.
-  * `WIP`: reworking by new concept of base images and creating new `nginx 1.27.0` with static build.
+	* `sentry` and `redash` was set to `experimental` status bacause `ci` is not stable yet.
+	* reworked `teamcity:server` image.
+	* reworked `vscode` image.
+	* updated `monerod` and `p2pool` images to latest versions.
+	* updated `nodejs` and `jdk` images to latest versions.
+	* added extended `nodejs` and `jdk` base images support.
+	* added `dotnet` base images support.
+	* added `13-trixie` and `sid` - `Debian` base images support.
+	* fixed `Makefile`+ gha
+	* added support of `zabbix` version `7.0` + gha
+	* dropped `Astra CE\SE` due potencial license issues. Sorry.
+	* dropped `kaniko` local script instead of `pip` verion.
+	* added `Support Document for Docker Image Concepts in Project` document.
+	* backported new `CVE-fixed` versions of `atlassian` images.
+	* `WIP`: reworking by new concept of base images and creating new `nginx 1.27.0` with static build.
 * `july`
   * Start migration from `Odrey's` repos due to author's rot.
 	* [@oerdnj](https://github.com/oerdnj) go to hell, [xenophobe](https://github.com/oerdnj/deb.sury.org/issues/2155)! :fu:

README.md

@@ -1,13 +1,5 @@
 #  [![Activity](https://img.shields.io/github/commit-activity/m/EpicMorg/docker?label=commits&style=flat-square)](https://github.com/EpicMorg/docker/commits) [![GitHub issues](https://img.shields.io/github/issues/EpicMorg/docker.svg?style=popout-square)](https://github.com/EpicMorg/docker/issues) [![GitHub forks](https://img.shields.io/github/forks/EpicMorg/docker.svg?style=popout-square)](https://github.com/EpicMorg/docker/network) [![GitHub stars](https://img.shields.io/github/stars/EpicMorg/docker.svg?style=popout-square)](https://github.com/EpicMorg/docker/stargazers)  [![Size](https://img.shields.io/github/repo-size/EpicMorg/docker?label=size&style=flat-square)](https://github.com/EpicMorg/docker/archive/master.zip) [![Release](https://img.shields.io/github/v/release/EpicMorg/docker?style=flat-square)](https://github.com/EpicMorg/docker/releases) [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/3658/badge)](https://bestpractices.coreinfrastructure.org/projects/3658) [![CodeScene System Mastery](https://codescene.io/projects/6535/status-badges/system-mastery)](https://codescene.io/projects/6535) [![GitHub license](https://img.shields.io/github/license/EpicMorg/docker.svg?style=popout-square)](LICENSE.md) [![Changelog](https://img.shields.io/badge/Changelog-yellow.svg?style=popout-square)](CHANGELOG.md)
 
-## Official Mirrors
-
-|  | `DockerHub` (default) | `Quai.io` (Mirror) | `Harbor` (CI Proxy) 
-|:-------------|:-------------|:-------------|:-------------
-| Links | https://hub.docker.com/r/epicmorg | https://quay.io/epicmorg | https://hub.epicm.org
-| Docker | `docker pull epicmorg/debian:boowkorm` |  `docker pull quay.io/epicmorg/debian:boowkorm` | `docker pull hub.epicm.org/epicmorg/debian:boowkorm`
-| Podman | `podman pull docker.io/epicmorg/debian:boowkorm` |  `podman pull quay.io/epicmorg/debian:boowkorm` | `podman pull hub.epicm.org/epicmorg/debian:boowkorm`
-
 ## DEPRECATION WARNING
 
 **At 1st of October 2024, all deprecated tags and images will be deleted from DockerHub:**
@@ -66,8 +58,8 @@ A collection of docker images for production use. This repo contains 2 types of
 | [![Atlassian Confluence](https://img.shields.io/badge/Atlassian%20Confluence--brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/confluence/download) |   [![](https://img.shields.io/docker/pulls/epicmorg/confluence.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/confluence/) | `Atlassian Confluence` server. You also can install `datacenter` edition.
 | [![Atlassian Jira](https://img.shields.io/badge/Atlassian%20Jira--brightgreen.svg?style=popout-square)](https://www.atlassian.com/software/jira/download) | [![](https://img.shields.io/docker/pulls/epicmorg/jira.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/jira/) | `Atlassian Jira: Softrware` server.  You also can install `servicedesk`, `core` or `datacenter` editions.
 | [![Nginx Mainline](https://img.shields.io/badge/Nginx--brightgreen.svg?style=popout-square)](https://nginx.org/en/download.html) |   [![](https://img.shields.io/docker/pulls/epicmorg/nginx.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/nginx/) | Mainline custom build by [EpicMorg Team](https://github.com/EpicMorg) with http2 support and some modules.
-| [![Apache2](https://img.shields.io/badge/Apache2--brightgreen.svg?style=popout-square)](https://deb.sury.su/)  |  [![](https://img.shields.io/docker/pulls/epicmorg/apache2.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/apache2/ ) | Latest pure apache2.
-| [![php7](https://img.shields.io/badge/php7--brightgreen.svg?style=popout-square)](https://deb.sury.su/) | [![](https://img.shields.io/docker/pulls/epicmorg/apache2.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/apache2/ ) |  php 7.3 custom build by [Ondrej Sury](https://launchpad.net/~ondrej). Component of container above.
+| [![Apache2](https://img.shields.io/badge/Apache2--brightgreen.svg?style=popout-square)](https://deb.sury.org/)  |  [![](https://img.shields.io/docker/pulls/epicmorg/apache2.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/apache2/ ) | Latest pure apache2.
+| [![php7](https://img.shields.io/badge/php7--brightgreen.svg?style=popout-square)](https://deb.sury.org/) | [![](https://img.shields.io/docker/pulls/epicmorg/apache2.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/apache2/ ) |  php 7.3 custom build by [Ondrej Sury](https://launchpad.net/~ondrej). Component of container above.
 | [![nc](https://img.shields.io/badge/NextCloud--brightgreen.svg?style=popout-square)](https://hub.docker.com/_/nextcloud)  |  [![](https://img.shields.io/docker/pulls/epicmorg/nextcloud.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/nextcloud/ ) | Fixed `nextcloud:latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
 | [![zabbix-agent](https://img.shields.io/badge/Zabbix%20Agent--brightgreen.svg?style=popout-square)](https://github.com/zabbix/zabbix-docker)  | [![](https://img.shields.io/docker/pulls/epicmorg/zabbix-agent.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/zabbix-agent/ ) | Fixed `zabbix/zabbix-agent:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
 | [![zabbix-server](https://img.shields.io/badge/Zabbix%20Server--brightgreen.svg?style=popout-square)](https://github.com/zabbix/zabbix-docker)  | [![](https://img.shields.io/docker/pulls/epicmorg/zabbix-server-mysql.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/zabbix-server-mysql/ ) | Fixed `zabbix/zabbix-server-mysql:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.

bin/ansible/generate.crowd.yml

@@ -1,21 +0,0 @@
-- name: Clear log file before write new stdout to it at this session
-  hosts: localhost
-  connection: local
-  tasks:
-    - name: echo -n > output.log
-      shell: echo -n > output.log
-
-- name: Lets Go!
-  hosts: localhost
-  connection: local
-  tasks:
-    - name: Create directory for ansible custom facts
-      debug:
-        msg: "[ Python: {{ ansible_facts['python_version'] }}, OS: {{ ansible_facts['distribution'] }} {{ ansible_facts['distribution_version'] }} ({{ansible_architecture }}), Ansible: {{ ansible_version.full }}]"
-
-- name: Generate Crowd images
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  roles:
-    - atlassian.crowd

bin/ansible/generate.testrail.yml

@@ -1,21 +0,0 @@
-- name: Clear log file before write new stdout to it at this session
-  hosts: localhost
-  connection: local
-  tasks:
-    - name: echo -n > output.log
-      shell: echo -n > output.log
-
-- name: Lets Go!
-  hosts: localhost
-  connection: local
-  tasks:
-    - name: Create directory for ansible custom facts
-      debug:
-        msg: "[ Python: {{ ansible_facts['python_version'] }}, OS: {{ ansible_facts['distribution'] }} {{ ansible_facts['distribution_version'] }} ({{ansible_architecture }}), Ansible: {{ ansible_version.full }}]"
-
-- name: Generate Jira images
-  hosts: localhost
-  connection: local
-  gather_facts: false
-  roles:
-    - gurock.testrail

bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk11

@@ -0,0 +1,44 @@
+FROM epicmorg/debian:bookworm-jdk11
+LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+
+ARG RELEASE
+ARG DOWNLOAD_URL
+
+##################################################################
+#                   Setup
+##################################################################
+ENV RUN_USER            daemon
+ENV RUN_GROUP           daemon
+
+# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
+ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
+ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
+
+VOLUME ["${BITBUCKET_HOME}"]
+WORKDIR $BITBUCKET_HOME
+
+# Expose HTTP and SSH ports
+EXPOSE 7990
+EXPOSE 7999
+
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
+    curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}"  &&  \
+    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR} && \
+    sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh             /entrypoint.sh

bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk17

@@ -0,0 +1,44 @@
+FROM epicmorg/debian:bookworm-jdk17
+LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+
+ARG RELEASE
+ARG DOWNLOAD_URL
+
+##################################################################
+#                   Setup
+##################################################################
+ENV RUN_USER            daemon
+ENV RUN_GROUP           daemon
+
+# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
+ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
+ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
+
+VOLUME ["${BITBUCKET_HOME}"]
+WORKDIR $BITBUCKET_HOME
+
+# Expose HTTP and SSH ports
+EXPOSE 7990
+EXPOSE 7999
+
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
+    curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}"  &&  \
+    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR} && \
+    sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh             /entrypoint.sh

bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.jdk8

@@ -0,0 +1,44 @@
+FROM epicmorg/debian:bookworm-jdk8
+LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+
+ARG RELEASE
+ARG DOWNLOAD_URL
+
+##################################################################
+#                   Setup
+##################################################################
+ENV RUN_USER            daemon
+ENV RUN_GROUP           daemon
+
+# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
+ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
+ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
+
+VOLUME ["${BITBUCKET_HOME}"]
+WORKDIR $BITBUCKET_HOME
+
+# Expose HTTP and SSH ports
+EXPOSE 7990
+EXPOSE 7999
+
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
+    curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}"  &&  \
+    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR} && \
+    sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh             /entrypoint.sh

bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk7

@@ -0,0 +1,45 @@
+FROM epicmorg/debian:bookworm-jdk7
+LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+
+ARG RELEASE
+ARG DOWNLOAD_URL
+
+##################################################################
+#                   Setup
+##################################################################
+ENV RUN_USER            daemon
+ENV RUN_GROUP           daemon
+
+# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
+ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
+ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
+ENV STASH_HOME=${BITBUCKET_HOME}
+
+VOLUME ["${BITBUCKET_HOME}"]
+WORKDIR $BITBUCKET_HOME
+
+# Expose HTTP and SSH ports
+EXPOSE 7990
+EXPOSE 7999
+
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
+    curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}"  &&  \
+    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR} && \
+#   sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh             /entrypoint.sh

bin/ansible/roles/atlassian.bitbucket/files/Dockerfile.legacy.jdk8

@@ -0,0 +1,45 @@
+FROM epicmorg/debian:bookworm-jdk8
+LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+#                   ARGuments
+##################################################################
+
+ARG RELEASE
+ARG DOWNLOAD_URL
+
+##################################################################
+#                   Setup
+##################################################################
+ENV RUN_USER            daemon
+ENV RUN_GROUP           daemon
+
+# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
+ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
+ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
+ENV STASH_HOME=${BITBUCKET_HOME}
+
+VOLUME ["${BITBUCKET_HOME}"]
+WORKDIR $BITBUCKET_HOME
+
+# Expose HTTP and SSH ports
+EXPOSE 7990
+EXPOSE 7999
+
+##################################################################
+#                   Installing
+##################################################################
+RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
+    curl --user-agent "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0" -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}"  &&  \
+    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR} && \
+#   sed -i -e 's/^# umask/umask/'            ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
+    update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
+    apt-get clean -y && \
+    apt-get autoclean -y && \
+    rm -rfv /var/lib/apt/lists/* && \
+    rm -rfv /var/cache/apt/archives/*.deb
+
+CMD ["/entrypoint.sh", "-fg"]
+ENTRYPOINT ["/usr/bin/tini", "--"]
+COPY entrypoint.sh             /entrypoint.sh

bin/ansible/roles/atlassian.bitbucket/files/Makefile

@@ -1,32 +1,30 @@
+PIP_BREAK_SYSTEM_PACKAGES=1
+
 all: app
 
 app:
-	make pip
 	make build
 	make deploy
 	make clean
 
 build:
-	make build-buildah
+	kaniko-wrapper --version
 
-deploy:
-	make deploy-buildah
+dry:
+	make dry-run
 
-build-buildah:
-	buildah-wrapper --build
+test:
+	make dry-run
 
-deploy-buildah:
-	buildah-wrapper --deploy
-
-build-kaniko:
-	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run
-
-deploy-kaniko:
-	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug
+dry-run:
+	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug --dry-run
 
 build-compose:
 	docker-compose build --compress --parallel --progress plain
 
+deploy:
+	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:v1.23.2-debug
+
 deploy-compose:
 	docker-compose push
 
@@ -36,9 +34,3 @@ clean:
 	docker network prune -f
 	docker volume prune -f
 	docker system prune -af
-	buildah rm -a
-	buildah rmi -a
-
-pip:
-	pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper
-	pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper

bin/ansible/roles/atlassian.bitbucket/files/docker-compose.jdk7.yml

@@ -0,0 +1,16 @@
+#version: '3'
+services:
+  app:
+    image: "epicmorg/bitbucket:${RELEASE}"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk7:
+    image: "epicmorg/bitbucket:${RELEASE}-jdk7"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}

bin/ansible/roles/atlassian.bitbucket/files/docker-compose.jdk8-11-17.yml

@@ -0,0 +1,32 @@
+#version: '3'
+services:
+  app:
+    image: "epicmorg/bitbucket:${RELEASE}"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk8:
+    image: "epicmorg/bitbucket:${RELEASE}-jdk8"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk11:
+    image: "epicmorg/bitbucket:${RELEASE}-jdk11"
+    build:
+      context: .
+      dockerfile: Dockerfile.jdk11
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk17:
+    image: "epicmorg/bitbucket:${RELEASE}-jdk17"
+    build:
+      context: .
+      dockerfile: Dockerfile.jdk17
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}

bin/ansible/roles/atlassian.bitbucket/files/docker-compose.jdk8-11.yml

@@ -0,0 +1,24 @@
+#version: '3'
+services:
+  app:
+    image: "epicmorg/bitbucket:${RELEASE}"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk8:
+    image: "epicmorg/bitbucket:${RELEASE}-jdk8"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk11:
+    image: "epicmorg/bitbucket:${RELEASE}-jdk11"
+    build:
+      context: .
+      dockerfile: Dockerfile.jdk11
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}

bin/ansible/roles/atlassian.bitbucket/files/docker-compose.jdk8.yml

@@ -0,0 +1,16 @@
+#version: '3'
+services:
+  app:
+    image: "epicmorg/bitbucket:${RELEASE}"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk8:
+    image: "epicmorg/bitbucket:${RELEASE}-jdk8"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}

bin/ansible/roles/atlassian.bitbucket/files/requirements.txt

@@ -0,0 +1,2 @@
+PyYAML
+python-dotenv

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.1.jdk7.yml

@@ -17,21 +17,21 @@
 
 - name: Copy .env with link from template to each version directory
   template:
-    src: "env/template.stash.1-3.env.j2"
+    src: "template.stash.1.env.j2"
     dest: "{{ target_directory_bitbucket_1 }}/{{ item }}/.env"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk7.yml.j2"
+  copy:
+    src: "docker-compose.jdk7.yml"
     dest: "{{ target_directory_bitbucket_1 }}/{{ item }}/docker-compose.yml"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.legacy.jdk7.j2"
+  copy:
+    src: "Dockerfile.legacy.jdk7"
     dest: "{{ target_directory_bitbucket_1 }}/{{ item }}/Dockerfile"
     force: true
   with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.2.jdk7.yml

@@ -17,21 +17,21 @@
 
 - name: Copy .env with link from template to each version directory
   template:
-    src: "env/template.stash.1-3.env.j2"
+    src: "template.stash.2.env.j2"
     dest: "{{ target_directory_bitbucket_2 }}/{{ item }}/.env"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk7.yml.j2"
+  copy:
+    src: "docker-compose.jdk7.yml"
     dest: "{{ target_directory_bitbucket_2 }}/{{ item }}/docker-compose.yml"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.legacy.jdk7.j2"
+  copy:
+    src: "Dockerfile.legacy.jdk7"
     dest: "{{ target_directory_bitbucket_2 }}/{{ item }}/Dockerfile"
     force: true
   with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.3.jdk8.yml

@@ -17,21 +17,21 @@
 
 - name: Copy .env with link from template to each version directory
   template:
-    src: "env/template.stash.1-3.env.j2"
+    src: "template.stash.3.env.j2"
     dest: "{{ target_directory_bitbucket_3 }}/{{ item }}/.env"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8.yml.j2"
+  copy:
+    src: "docker-compose.jdk8.yml"
     dest: "{{ target_directory_bitbucket_3 }}/{{ item }}/docker-compose.yml"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.legacy.jdk8.j2"
+  copy:
+    src: "Dockerfile.legacy.jdk8"
     dest: "{{ target_directory_bitbucket_3 }}/{{ item }}/Dockerfile"
     force: true
   with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.4.jdk8.yml

@@ -17,21 +17,21 @@
 
 - name: Copy .env with link from template to each version directory
   template:
-    src: "env/template.bitbucket.4-9.env.j2"
+    src: "template.bitbucket.4.env.j2"
     dest: "{{ target_directory_bitbucket_4 }}/{{ item }}/.env"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8.yml.j2"
+  copy:
+    src: "docker-compose.jdk8.yml"
     dest: "{{ target_directory_bitbucket_4 }}/{{ item }}/docker-compose.yml"
     force: true
   with_items: "{{ bitbucket_versions }}"
 
 - name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
+  copy:
+    src: "Dockerfile.legacy.jdk8"
     dest: "{{ target_directory_bitbucket_4 }}/{{ item }}/Dockerfile"
     force: true
   with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.5.jdk8.yml

@@ -1,52 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/5.jdk8.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_5 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_5 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8.yml.j2"
-    dest: "{{ target_directory_bitbucket_5 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_bitbucket_5 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_5 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_5 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.6.jdk8-11.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/6.jdk8-11.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_6 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_6 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8-11.yml.j2"
-    dest: "{{ target_directory_bitbucket_6 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_bitbucket_6 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk11 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk11.j2"
-    dest: "{{ target_directory_bitbucket_6 }}/{{ item }}/Dockerfile.jdk11"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_6 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_6 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.7.jdk8-11.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/7.jdk8-11.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_7 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_7 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8-11.yml.j2"
-    dest: "{{ target_directory_bitbucket_7 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_bitbucket_7 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk11 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk11.j2"
-    dest: "{{ target_directory_bitbucket_7 }}/{{ item }}/Dockerfile.jdk11"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_7 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_7 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.8.jdk17.yml

@@ -1,52 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/8.jdk17.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_8 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk17.yml.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk17 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk17.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.8.jdk8-11-17.yml

@@ -1,66 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/8.jdk8-11-17.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_8 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8-11-17.yml.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk11 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk11.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Dockerfile.jdk11"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk17 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk17.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Dockerfile.jdk17"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.8.jdk8-11.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/8.jdk8-11.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_8 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8-11.yml.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk11 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk11.j2"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Dockerfile.jdk11"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_8 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.9.jdk17-21.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/9.jdk17-21.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_9 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk17-21.yml.j2"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk17.j2"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk21 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk21.j2"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/Dockerfile.jdk21"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.bitbucket.9.jdk17.yml

@@ -1,52 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/bitbucket/9.jdk17.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    bitbucket_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Bitbucket versions
-  file:
-    path: "{{ target_directory_bitbucket_9 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.bitbucket.4-9.env.j2"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk17.yml.j2"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Dockerfile.jdk17 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk17.j2"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ bitbucket_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_bitbucket_9 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ bitbucket_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8-11.yml

@@ -0,0 +1,58 @@
+- name: Read versions from file
+  slurp:
+     src: "roles/common/files/versions/jira/8.jdk8-11.txt"
+  register: version_output
+
+- name: Set version variable
+  set_fact:
+    jira_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
+
+- name: Create directories for Jira versions
+  file:
+    path: "{{ target_directory_jira_8 }}/{{ item }}"
+    state: directory
+    mode: '0755'
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy .env with link from template to each version directory
+  template:
+    src: "template.env.j2"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/.env"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy docker-compose.yml from template to each version directory
+  copy:
+    src: "docker-compose.yml"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/docker-compose.yml"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Dockerfile from template to each version directory
+  copy:
+    src: "Dockerfile.jdk8"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Dockerfile.jdk11 from 'files' directory to each version directory
+  copy:
+    src: "Dockerfile.jdk11"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile.jdk11"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy entrypoint.sh from 'files' directory to each version directory
+  copy:
+    src: "entrypoint.sh"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/entrypoint.sh"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Makefile from 'files' directory to each version directory
+  copy:
+    src: "Makefile"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/Makefile"
+    force: true
+  with_items: "{{ jira_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.8.jdk8.yml

@@ -0,0 +1,51 @@
+- name: Read versions from file
+  slurp:
+     src: "roles/common/files/versions/jira/8.jdk8.txt"
+  register: version_output
+
+- name: Set version variable
+  set_fact:
+    jira_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
+
+- name: Create directories for Jira versions
+  file:
+    path: "{{ target_directory_jira_8 }}/{{ item }}"
+    state: directory
+    mode: '0755'
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy .env with link from template to each version directory
+  template:
+    src: "template.env.j2"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/.env"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy docker-compose.yml from template to each version directory
+  copy:
+    src: "docker-compose.yml"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/docker-compose.yml"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Dockerfile from template to each version directory
+  copy:
+    src: "Dockerfile.jdk8"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/Dockerfile"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy entrypoint.sh from 'files' directory to each version directory
+  copy:
+    src: "entrypoint.sh"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/entrypoint.sh"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Makefile from 'files' directory to each version directory
+  copy:
+    src: "Makefile"
+    dest: "{{ target_directory_jira_8 }}/{{ item }}/Makefile"
+    force: true
+  with_items: "{{ jira_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/atlassian.jira.9.jdk8-11-17.yml

@@ -0,0 +1,65 @@
+- name: Read versions from file
+  slurp:
+     src: "roles/common/files/versions/jira/9.jdk8-11-17.txt"
+  register: version_output
+
+- name: Set version variable
+  set_fact:
+    jira_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
+
+- name: Create directories for Jira versions
+  file:
+    path: "{{ target_directory_jira_9 }}/{{ item }}"
+    state: directory
+    mode: '0755'
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy .env with link from template to each version directory
+  template:
+    src: "template.env.j2"
+    dest: "{{ target_directory_jira_9 }}/{{ item }}/.env"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy docker-compose.yml from template to each version directory
+  copy:
+    src: "docker-compose.jdk8-11-17.yml"
+    dest: "{{ target_directory_jira_9 }}/{{ item }}/docker-compose.yml"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Dockerfile from template to each version directory
+  copy:
+    src: "Dockerfile.jdk8"
+    dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Dockerfile.jdk11 from 'files' directory to each version directory
+  copy:
+    src: "Dockerfile.jdk11"
+    dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile.jdk11"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Dockerfile.jdk17 from 'files' directory to each version directory
+  copy:
+    src: "Dockerfile.jdk17"
+    dest: "{{ target_directory_jira_9 }}/{{ item }}/Dockerfile.jdk17"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy entrypoint.sh from 'files' directory to each version directory
+  copy:
+    src: "entrypoint.sh"
+    dest: "{{ target_directory_jira_9 }}/{{ item }}/entrypoint.sh"
+    force: true
+  with_items: "{{ jira_versions }}"
+
+- name: Copy Makefile from 'files' directory to each version directory
+  copy:
+    src: "Makefile"
+    dest: "{{ target_directory_jira_9 }}/{{ item }}/Makefile"
+    force: true
+  with_items: "{{ jira_versions }}"

bin/ansible/roles/atlassian.bitbucket/tasks/main.yml

@@ -1,35 +1,11 @@
-# - name: "Generate images for Stash (Bitbucket) 1 (jdk7)"
-#   import_tasks: atlassian.bitbucket.1.jdk7.yml
-# 
-# - name: "Generate images for  Stash (Bitbucket) 2 (jdk7)"
-#   import_tasks: atlassian.bitbucket.2.jdk7.yml
-# 
-# - name: "Generate images for  Stash (Bitbucket) 3 (jdk8)"
-#   import_tasks: atlassian.bitbucket.3.jdk8.yml
-# 
-# - name: "Generate images for  Bitbucket 4 (jdk8)"
-#   import_tasks: atlassian.bitbucket.4.jdk8.yml
-# 
-# - name: "Generate images for  Bitbucket 5 (jdk8)"
-#   import_tasks: atlassian.bitbucket.5.jdk8.yml
-# 
-# - name: "Generate images for  Bitbucket 6 (jdk8 + jdk11)"
-#   import_tasks: atlassian.bitbucket.6.jdk8-11.yml
-# 
-# - name: "Generate images for  Bitbucket 7 (jdk8 + jdk11)"
-#   import_tasks: atlassian.bitbucket.7.jdk8-11.yml
+#- name: "Generate images for Stash (Bitbucket) 1 (jdk7)"
+#  import_tasks: atlassian.bitbucket.1.jdk7.yml
 
-- name: "Generate images for  Bitbucket 8 (jdk8 + jdk11)"
-  import_tasks: atlassian.bitbucket.8.jdk8-11.yml
+#- name: "Generate images for  Stash (Bitbucket) 2 (jdk7)"
+#  import_tasks: atlassian.bitbucket.2.jdk7.yml
 
-- name: "Generate images for  Bitbucket 8 (jdk8 + jdk11 + jdk17)"
-  import_tasks: atlassian.bitbucket.8.jdk8-11-17.yml
+#- name: "Generate images for  Stash (Bitbucket) 3 (jdk8)"
+#  import_tasks: atlassian.bitbucket.3.jdk8.yml
 
-- name: "Generate images for  Bitbucket 8 (jdk17)"
-  import_tasks: atlassian.bitbucket.8.jdk17.yml
-
-- name: "Generate images for  Bitbucket 9 (jdk17)"
-  import_tasks: atlassian.bitbucket.9.jdk17.yml
-
-- name: "Generate images for  Bitbucket 9 (jdk17 + jdk21)"
-  import_tasks: atlassian.bitbucket.9.jdk17-21.yml
+- name: "Generate images for  Bitbucket 4 (jdk8)"
+  import_tasks: atlassian.bitbucket.4.jdk8.yml

bin/ansible/roles/atlassian.bitbucket/templates/docker-compose/template.docker-compose.jdk17-21.yml.j2

@@ -1,14 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}"
-    build:
-      context: .
-  app-jdk17:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk17"
-    build:
-      context: .
-  app-jdk21:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk21"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk21

bin/ansible/roles/atlassian.bitbucket/templates/docker-compose/template.docker-compose.jdk17.yml.j2

@@ -1,9 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}"
-    build:
-      context: .
-  app-jdk17:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk17"
-    build:
-      context: .

bin/ansible/roles/atlassian.bitbucket/templates/docker-compose/template.docker-compose.jdk7.yml.j2

@@ -1,9 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}"
-    build:
-      context: .
-  app-jdk7:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk7"
-    build:
-      context: .

bin/ansible/roles/atlassian.bitbucket/templates/docker-compose/template.docker-compose.jdk8-11-17.yml.j2

@@ -1,19 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}"
-    build:
-      context: .
-  app-jdk8:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk8"
-    build:
-      context: .
-  app-jdk11:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk11"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk11
-  app-jdk17:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk17"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk17

bin/ansible/roles/atlassian.bitbucket/templates/docker-compose/template.docker-compose.jdk8-11.yml.j2

@@ -1,14 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}"
-    build:
-      context: .
-  app-jdk8:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk8"
-    build:
-      context: .
-  app-jdk11:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk11"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk11

bin/ansible/roles/atlassian.bitbucket/templates/docker-compose/template.docker-compose.jdk8.yml.j2

@@ -1,9 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}"
-    build:
-      context: .
-  app-jdk8:
-    image: "hub.epicm.org/epicmorg/bitbucket:{{ item }}-jdk8"
-    build:
-      context: .

bin/ansible/roles/atlassian.bitbucket/templates/dockerfile/template.Dockerfile.jdk11.j2

@@ -1,95 +0,0 @@
-FROM hub.epicm.org/epicmorg/debian:bookworm-jdk11
-LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   ARGuments
-##################################################################
-ARG RELEASE={{ item }}
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-bitbucket-${RELEASE}.tar.gz
-ARG TEMP_ARCHIVE=/tmp/atlassian-bitbucket-${RELEASE}.tar.gz
-
-##################################################################
-#                   Setup
-##################################################################
-ENV RUN_USER            daemon
-ENV RUN_GROUP           daemon
-
-# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
-ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
-ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
-
-VOLUME ["${BITBUCKET_HOME}"]
-WORKDIR $BITBUCKET_HOME
-
-# Expose HTTP and SSH ports
-EXPOSE 7990
-EXPOSE 7999
-
-##################################################################
-#                   Installing
-##################################################################
-ADD ${DOWNLOAD_URL} /tmp
-RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
-    tar -xvzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${BITBUCKET_INSTALL_DIR}" && \
-    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}
-
-##################################################################
-#                   Post-Installing Setup
-##################################################################
-RUN rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \
-    rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \
-    rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \
-    apt-get update &&  \
-    apt-get remove -y \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp && \
-    apt-get autoremove -y && \
-    apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp
-
-##################################################################
-#                  Git Check
-##################################################################
-RUN git-lfs install --skip-repo --system --force && \
-    echo "=============================================" && \
-    echo git $(git --version) && \
-    echo git-lfs $(git-lfs --version) && \
-    echo "============================================="
-
-##################################################################
-#                  cleanup
-##################################################################
-RUN echo "clean up" && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-RUN updatedb

bin/ansible/roles/atlassian.bitbucket/templates/dockerfile/template.Dockerfile.jdk17.j2

@@ -1,95 +0,0 @@
-FROM hub.epicm.org/epicmorg/debian:bookworm-jdk17
-LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   ARGuments
-##################################################################
-ARG RELEASE={{ item }}
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-bitbucket-${RELEASE}.tar.gz
-ARG TEMP_ARCHIVE=/tmp/atlassian-bitbucket-${RELEASE}.tar.gz
-
-##################################################################
-#                   Setup
-##################################################################
-ENV RUN_USER            daemon
-ENV RUN_GROUP           daemon
-
-# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
-ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
-ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
-
-VOLUME ["${BITBUCKET_HOME}"]
-WORKDIR $BITBUCKET_HOME
-
-# Expose HTTP and SSH ports
-EXPOSE 7990
-EXPOSE 7999
-
-##################################################################
-#                   Installing
-##################################################################
-ADD ${DOWNLOAD_URL} /tmp
-RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
-    tar -xvzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${BITBUCKET_INSTALL_DIR}" && \
-    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}
-
-##################################################################
-#                   Post-Installing Setup
-##################################################################
-RUN rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \
-    rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \
-    rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \
-    apt-get update &&  \
-    apt-get remove -y \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp && \
-    apt-get autoremove -y && \
-    apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp
-
-##################################################################
-#                  Git Check
-##################################################################
-RUN git-lfs install --skip-repo --system --force && \
-    echo "=============================================" && \
-    echo git $(git --version) && \
-    echo git-lfs $(git-lfs --version) && \
-    echo "============================================="
-
-##################################################################
-#                  cleanup
-##################################################################
-RUN echo "clean up" && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-RUN updatedb

bin/ansible/roles/atlassian.bitbucket/templates/dockerfile/template.Dockerfile.jdk21.j2

@@ -1,95 +0,0 @@
-FROM hub.epicm.org/epicmorg/debian:bookworm-jdk21
-LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   ARGuments
-##################################################################
-ARG RELEASE={{ item }}
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-bitbucket-${RELEASE}.tar.gz
-ARG TEMP_ARCHIVE=/tmp/atlassian-bitbucket-${RELEASE}.tar.gz
-
-##################################################################
-#                   Setup
-##################################################################
-ENV RUN_USER            daemon
-ENV RUN_GROUP           daemon
-
-# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
-ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
-ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
-
-VOLUME ["${BITBUCKET_HOME}"]
-WORKDIR $BITBUCKET_HOME
-
-# Expose HTTP and SSH ports
-EXPOSE 7990
-EXPOSE 7999
-
-##################################################################
-#                   Installing
-##################################################################
-ADD ${DOWNLOAD_URL} /tmp
-RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
-    tar -xvzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${BITBUCKET_INSTALL_DIR}" && \
-    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}
-
-##################################################################
-#                   Post-Installing Setup
-##################################################################
-RUN rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \
-    rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \
-    rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \
-    apt-get update &&  \
-    apt-get remove -y \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp && \
-    apt-get autoremove -y && \
-    apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp
-
-##################################################################
-#                  Git Check
-##################################################################
-RUN git-lfs install --skip-repo --system --force && \
-    echo "=============================================" && \
-    echo git $(git --version) && \
-    echo git-lfs $(git-lfs --version) && \
-    echo "============================================="
-
-##################################################################
-#                  cleanup
-##################################################################
-RUN echo "clean up" && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-RUN updatedb

bin/ansible/roles/atlassian.bitbucket/templates/dockerfile/template.Dockerfile.jdk8.j2

@@ -1,95 +0,0 @@
-FROM hub.epicm.org/epicmorg/debian:bookworm-jdk8
-LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   ARGuments
-##################################################################
-ARG RELEASE={{ item }}
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-bitbucket-${RELEASE}.tar.gz
-ARG TEMP_ARCHIVE=/tmp/atlassian-bitbucket-${RELEASE}.tar.gz
-
-##################################################################
-#                   Setup
-##################################################################
-ENV RUN_USER            daemon
-ENV RUN_GROUP           daemon
-
-# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
-ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
-ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
-
-VOLUME ["${BITBUCKET_HOME}"]
-WORKDIR $BITBUCKET_HOME
-
-# Expose HTTP and SSH ports
-EXPOSE 7990
-EXPOSE 7999
-
-##################################################################
-#                   Installing
-##################################################################
-ADD ${DOWNLOAD_URL} /tmp
-RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
-    tar -xvzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${BITBUCKET_INSTALL_DIR}" && \
-    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}
-
-##################################################################
-#                   Post-Installing Setup
-##################################################################
-RUN rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \
-    rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \
-    rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \
-    apt-get update &&  \
-    apt-get remove -y \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp && \
-    apt-get autoremove -y && \
-    apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp
-
-##################################################################
-#                  Git Check
-##################################################################
-RUN git-lfs install --skip-repo --system --force && \
-    echo "=============================================" && \
-    echo git $(git --version) && \
-    echo git-lfs $(git-lfs --version) && \
-    echo "============================================="
-
-##################################################################
-#                  cleanup
-##################################################################
-RUN echo "clean up" && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-RUN updatedb

bin/ansible/roles/atlassian.bitbucket/templates/dockerfile/template.Dockerfile.legacy.jdk7.j2

@@ -1,96 +0,0 @@
-FROM hub.epicm.org/epicmorg/debian:bookworm-jdk7
-LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   ARGuments
-##################################################################
-ARG RELEASE={{ item }}
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-stash-${RELEASE}.tar.gz
-ARG TEMP_ARCHIVE=/tmp/atlassian-stash-${RELEASE}.tar.gz
-
-##################################################################
-#                   Setup
-##################################################################
-ENV RUN_USER            daemon
-ENV RUN_GROUP           daemon
-
-# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
-ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
-ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
-ENV STASH_HOME=${BITBUCKET_HOME}
-
-VOLUME ["${BITBUCKET_HOME}"]
-WORKDIR $BITBUCKET_HOME
-
-# Expose HTTP and SSH ports
-EXPOSE 7990
-EXPOSE 7999
-
-##################################################################
-#                   Installing
-##################################################################
-ADD ${DOWNLOAD_URL} /tmp
-RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
-    tar -xvzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${BITBUCKET_INSTALL_DIR}" && \
-    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}
-
-##################################################################
-#                   Post-Installing Setup
-##################################################################
-RUN rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \
-    rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \
-    rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \
-    apt-get update &&  \
-    apt-get remove -y \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp && \
-    apt-get autoremove -y && \
-    apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp
-
-##################################################################
-#                  Git Check
-##################################################################
-RUN git-lfs install --skip-repo --system --force && \
-    echo "=============================================" && \
-    echo git $(git --version) && \
-    echo git-lfs $(git-lfs --version) && \
-    echo "============================================="
-
-##################################################################
-#                  cleanup
-##################################################################
-RUN echo "clean up" && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-RUN updatedb

bin/ansible/roles/atlassian.bitbucket/templates/dockerfile/template.Dockerfile.legacy.jdk8.j2

@@ -1,96 +0,0 @@
-FROM hub.epicm.org/epicmorg/debian:bookworm-jdk8
-LABEL maintainer="Atlassian Bitbucket Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   ARGuments
-##################################################################
-ARG RELEASE={{ item }}
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-stash-${RELEASE}.tar.gz
-ARG TEMP_ARCHIVE=/tmp/atlassian-stash-${RELEASE}.tar.gz
-
-##################################################################
-#                   Setup
-##################################################################
-ENV RUN_USER            daemon
-ENV RUN_GROUP           daemon
-
-# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
-ENV BITBUCKET_HOME          /var/atlassian/application-data/bitbucket
-ENV BITBUCKET_INSTALL_DIR   /opt/atlassian/bitbucket
-ENV STASH_HOME=${BITBUCKET_HOME}
-
-VOLUME ["${BITBUCKET_HOME}"]
-WORKDIR $BITBUCKET_HOME
-
-# Expose HTTP and SSH ports
-EXPOSE 7990
-EXPOSE 7999
-
-##################################################################
-#                   Installing
-##################################################################
-ADD ${DOWNLOAD_URL} /tmp
-RUN mkdir -p                                 ${BITBUCKET_INSTALL_DIR} &&  \
-    tar -xvzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${BITBUCKET_INSTALL_DIR}" && \
-    chown -R ${RUN_USER}:${RUN_GROUP}        ${BITBUCKET_INSTALL_DIR}
-
-##################################################################
-#                   Post-Installing Setup
-##################################################################
-RUN rm -rfv /etc/apt/sources.list.d/launchpad_git-mainline.list && \
-    rm -rfv /etc/apt/sources.list.d/launchpad_git-stable.list && \
-    rm -rfv /etc/apt/sources.list.d/github_git-lfs.list && \
-    apt-get update &&  \
-    apt-get remove -y \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp && \
-    apt-get autoremove -y && \
-    apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests \
-      git \
-      git-extras \
-      git-flow \
-      git-cvs \
-      git-doc \
-      git-email \
-      git-mediawiki \
-      git-crypt \
-      git-lfs \
-      git-ftp
-
-##################################################################
-#                  Git Check
-##################################################################
-RUN git-lfs install --skip-repo --system --force && \
-    echo "=============================================" && \
-    echo git $(git --version) && \
-    echo git-lfs $(git-lfs --version) && \
-    echo "============================================="
-
-##################################################################
-#                  cleanup
-##################################################################
-RUN echo "clean up" && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-RUN updatedb

bin/ansible/roles/atlassian.bitbucket/templates/env/template.bitbucket.4-9.env.j2

@@ -1,3 +0,0 @@
-RELEASE={{ item }}
-DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-bitbucket-${RELEASE}.tar.gz
-TEMP_ARCHIVE=/tmp/atlassian-bitbucket-${RELEASE}.tar.gz

bin/ansible/roles/atlassian.bitbucket/templates/env/template.stash.1-3.env.j2

@@ -1,3 +0,0 @@
-RELEASE={{ item }}
-DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-stash-${RELEASE}.tar.gz
-TEMP_ARCHIVE=/tmp/atlassian-stash-${RELEASE}.tar.gz

bin/ansible/roles/atlassian.bitbucket/templates/template.bitbucket.4.env.j2

@@ -0,0 +1,2 @@
+RELEASE={{ item }}
+DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-bitbucket-${RELEASE}.tar.gz

bin/ansible/roles/atlassian.bitbucket/templates/template.stash.1.env.j2

@@ -0,0 +1,2 @@
+RELEASE={{ item }}
+DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-stash-${RELEASE}.tar.gz

bin/ansible/roles/atlassian.bitbucket/templates/template.stash.2.env.j2

@@ -0,0 +1,2 @@
+RELEASE={{ item }}
+DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-stash-${RELEASE}.tar.gz

bin/ansible/roles/atlassian.bitbucket/templates/template.stash.3.env.j2

@@ -0,0 +1,2 @@
+RELEASE={{ item }}
+DOWNLOAD_URL=https://www.atlassian.com/software/stash/downloads/binary/atlassian-stash-${RELEASE}.tar.gz

bin/ansible/roles/atlassian.bitbucket/vars/main.yml

@@ -7,4 +7,3 @@ target_directory_bitbucket_5: "/opt/tmp/bitbucket/5"
 target_directory_bitbucket_6: "/opt/tmp/bitbucket/6"
 target_directory_bitbucket_7: "/opt/tmp/bitbucket/7"
 target_directory_bitbucket_8: "/opt/tmp/bitbucket/8"
-target_directory_bitbucket_9: "/opt/tmp/bitbucket/9"

bin/ansible/roles/atlassian.confluence/files/Makefile

@@ -1,44 +0,0 @@
-all: app
-
-app:
-	make pip
-	make build
-	make deploy
-	make clean
-
-build:
-	make build-buildah
-
-deploy:
-	make deploy-buildah
-
-build-buildah:
-	buildah-wrapper --build
-
-deploy-buildah:
-	buildah-wrapper --deploy
-
-build-kaniko:
-	kaniko-wrapper --kaniko-image gcr.io/kaniko-project/executor:debug --dry-run
-
-deploy-kaniko:
-	kaniko-wrapper --deploy --kaniko-image gcr.io/kaniko-project/executor:debug
-
-build-compose:
-	docker-compose build --compress --parallel --progress plain
-
-deploy-compose:
-	docker-compose push
-
-clean:
-	docker container prune -f
-	docker image prune -f
-	docker network prune -f
-	docker volume prune -f
-	docker system prune -af
-	buildah rm -a
-	buildah rmi -a
-
-pip:
-	pip3 install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper
-	pip install --break-system-packages --no-cache-dir kaniko-wrapper buildah-wrapper

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.4.jdk6-jdk7.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/4.jdk6-jdk7.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_4 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk6-7.yml.j2"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk6.j2"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile.jdk7 from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk7.j2"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/Dockerfile.jdk7"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.4.jdk6.yml

@@ -1,52 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/4.jdk6.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_4 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk6.yml.j2"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk6.j2"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_4 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.5.jdk7-jdk8.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/5.jdk7-jdk8.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_5 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk7-8.yml.j2"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk7.j2"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/Dockerfile.jdk8"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.5.jdk7.yml

@@ -1,52 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/5.jdk7.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_5 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk7.yml.j2"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk7.j2"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_5 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.6.jdk8.yml

@@ -1,52 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/6.jdk8.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_6 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_6 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8.yml.j2"
-    dest: "{{ target_directory_confluence_6 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_confluence_6 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_6 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_6 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.7.jdk8-jdk11.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/7.jdk8-11.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_7 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8-11.yml.j2"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk11.j2"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/Dockerfile.jdk11"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.7.jdk8.yml

@@ -1,52 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/7.jdk8.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_7 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk8.yml.j2"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk8.j2"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_7 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.8.jdk11-jdk17.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/8.jdk11-17.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_8 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_8 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk11-17.yml.j2"
-    dest: "{{ target_directory_confluence_8 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk11.j2"
-    dest: "{{ target_directory_confluence_8 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk17.j2"
-    dest: "{{ target_directory_confluence_8 }}/{{ item }}/Dockerfile.jdk17"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_8 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_8 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/atlassian.confluence.9.jdk17-jdk21.yml

@@ -1,59 +0,0 @@
-- name: Read versions from file
-  slurp:
-     src: "roles/common/files/versions/confluence/9.jdk17-21.txt"
-  register: version_output
-
-- name: Set version variable
-  set_fact:
-    confluence_versions: "{{ version_output['content'] | b64decode | trim | split('\n') }}"
-
-- name: Create directories for Confluence versions
-  file:
-    path: "{{ target_directory_confluence_9 }}/{{ item }}"
-    state: directory
-    mode: '0755'
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy .env with link from template to each version directory
-  template:
-    src: "env/template.env.j2"
-    dest: "{{ target_directory_confluence_9 }}/{{ item }}/.env"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy docker-compose.yml from template to each version directory
-  template:
-    src: "docker-compose/template.docker-compose.jdk17-21.yml.j2"
-    dest: "{{ target_directory_confluence_9 }}/{{ item }}/docker-compose.yml"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk17.j2"
-    dest: "{{ target_directory_confluence_9 }}/{{ item }}/Dockerfile"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Dockerfile from template to each version directory
-  template:
-    src: "dockerfile/template.Dockerfile.jdk21.j2"
-    dest: "{{ target_directory_confluence_9 }}/{{ item }}/Dockerfile.jdk21"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy entrypoint.sh from 'files' directory to each version directory
-  copy:
-    src: "entrypoint.sh"
-    dest: "{{ target_directory_confluence_9 }}/{{ item }}/entrypoint.sh"
-    mode: "0777"
-    force: true
-  with_items: "{{ confluence_versions }}"
-
-- name: Copy Makefile from 'files' directory to each version directory
-  copy:
-    src: "Makefile"
-    dest: "{{ target_directory_confluence_9 }}/{{ item }}/Makefile"
-    force: true
-  with_items: "{{ confluence_versions }}"

bin/ansible/roles/atlassian.confluence/tasks/main.yml

@@ -1,26 +0,0 @@
-# - name: "Generate images for Confluence 4 (jdk6)"
-#   import_tasks: atlassian.confluence.4.jdk6.yml
-# 
-# - name: "Generate images for Confluence 4 (jdk6 + jdk7)"
-#   import_tasks: atlassian.confluence.4.jdk6-jdk7.yml
-# 
-# - name: "Generate images for Confluence 5 (jdk7)"
-#   import_tasks: atlassian.confluence.5.jdk7.yml
-# 
-# - name: "Generate images for Confluence 5 (jdk7 + jdk8)"
-#   import_tasks: atlassian.confluence.5.jdk7-jdk8.yml
-#
-# - name: "Generate images for Confluence 6 (jdk8)"
-#   import_tasks: atlassian.confluence.6.jdk8.yml
-#
-# - name: "Generat images for Confluence 7 (jdk8)"
-#   import_tasks: atlassian.confluence.7.jdk8.yml
-#
-# - name: "Generate images for Confluence 7 (jdk8 + jdk11)"
-#   import_tasks: atlassian.confluence.7.jdk8-jdk11.yml
-#
-# - name: "Generate images for Confluence 8 (jdk11 + jdk17)"
-#   import_tasks: atlassian.confluence.8.jdk11-jdk17.yml
-
-- name: "Generate images for Confluence 9 (jdk17 + jdk21)"
-  import_tasks: atlassian.confluence.9.jdk17-jdk21.yml

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk11-17.yml.j2

@@ -1,14 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk11:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk11"
-    build:
-      context: .
-  app-jdk17:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk17"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk17

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk17-21.yml.j2

@@ -1,14 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk17:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk17"
-    build:
-      context: .
-  app-jdk21:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk21"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk21

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk6-7.yml.j2

@@ -1,14 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk6:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk6"
-    build:
-      context: .
-  app-jdk7:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk7"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk7

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk6.yml.j2

@@ -1,9 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk6:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk6"
-    build:
-      context: .

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk7-8.yml.j2

@@ -1,14 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk7:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk7"
-    build:
-      context: .
-  app-jdk8:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk8"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk8

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk7.yml.j2

@@ -1,9 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk7:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk7"
-    build:
-      context: .

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk8-11.yml.j2

@@ -1,14 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk8:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk8"
-    build:
-      context: .
-  app-jdk11:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk11"
-    build:
-      context: .
-      dockerfile: Dockerfile.jdk11

bin/ansible/roles/atlassian.confluence/templates/docker-compose/template.docker-compose.jdk8.yml.j2

@@ -1,9 +0,0 @@
-services:
-  app:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}"
-    build:
-      context: .
-  app-jdk8:
-    image: "hub.epicm.org/epicmorg/confluence:{{ item }}-jdk8"
-    build:
-      context: .

bin/ansible/roles/atlassian.confluence/templates/dockerfile/template.Dockerfile.jdk11.j2

@@ -1,64 +0,0 @@
-FROM hub.epicm.org/epicmorg/debian:bookworm-jdk11
-LABEL maintainer="Atlassian Confluence Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-#                   ARGuments
-##################################################################
-ARG RELEASE={{ item }}
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${RELEASE}.tar.gz
-ARG TEMP_ARCHIVE=/tmp/atlassian-confluence-${RELEASE}.tar.gz
-
-##################################################################
-#                   Setup
-##################################################################
-ENV RUN_USER            daemon
-ENV RUN_GROUP           daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME          /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR   /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-#                   Installing
-##################################################################
-ADD ${DOWNLOAD_URL} /tmp
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} && \
-    tar -xvzf ${TEMP_ARCHIVE} --strip-components=1 --directory "${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 && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-##################################################################
-#                  cleanup
-##################################################################
-RUN echo "clean up" && \
-    apt-get clean -y && \
-    apt-get autoremove -y && \
-    apt-get autoclean -y && \
-    rm -rfv /var/lib/apt/lists/* && \
-    rm -rfv /var/cache/apt/archives/*.deb && \
-    rm -rfv /root/tmp/* && \
-    rm -rfv /tmp/*
-
-COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-
-RUN updatedb