Prep for 3007

PaulChristophel · Mar 6, 2024 · 5662abb · 5662abb
1 parent e222280
commit 5662abb
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 34 deletions.
diff --git a/.github/workflows/latest.yaml b/.github/workflows/latest.yaml
@@ -8,7 +8,8 @@ on:
       - '[0-9]+.[0-9]+-[0-9]+'
 
 jobs:
-  build-python3-12-3006:
+
+  build-python3-12-3007:
     runs-on: ubuntu-22.04
     env:
       DOCKER_USERNAME: pcm0
@@ -26,7 +27,7 @@ jobs:
       continue-on-error: true
       run: |
         podman pull python:3.12-alpine
-        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006.txt . \
+        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007.txt . \
                      -t docker.io/pcm0/salt:3.12-latest-alpine \
                      -t docker.io/pcm0/salt:3.12-${{ env.BUILD }}-alpine \
                      -t docker.io/pcm0/salt:3.12-latest \
@@ -48,7 +49,7 @@ jobs:
     - name: Docker System Prune
       run: |
         podman system prune --force --all
-  build-python3-12-3006-isalt:
+  build-python3-12-3007-isalt:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: pcm0
@@ -66,7 +67,7 @@ jobs:
       continue-on-error: true
       run: |
         podman pull python:3.12-alpine
-        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006-isalt.txt . \
+        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007-isalt.txt . \
                      -t docker.io/pcm0/salt:3.12-latest-isalt-alpine \
                      -t docker.io/pcm0/salt:3.12-${{ env.BUILD }}-isalt-alpine \
                      -t docker.io/pcm0/salt:3.12-latest-isalt \
@@ -84,7 +85,7 @@ jobs:
         podman logout
         podman login $ACR_URL --username $ACR_USERNAME --password $ACR_PASSWORD
         podman images | awk "/$ACR_URL\/pmartin47\/salt/&&/${{ env.SHORT_BUILDSHA }}/ { print \$1\":\"\$2 }" | xargs -I {} podman push {}
-  build-python3-11-3006:
+  build-python3-11-3007:
     runs-on: ubuntu-22.04
     env:
       DOCKER_USERNAME: pcm0
@@ -102,7 +103,7 @@ jobs:
       continue-on-error: true
       run: |
         podman pull python:3.11-alpine
-        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006.txt . \
+        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007.txt . \
                      -t docker.io/pcm0/salt:3.11-latest-alpine \
                      -t docker.io/pcm0/salt:3.11-${{ env.BUILD }}-alpine \
                      -t docker.io/pcm0/salt:3.11-latest \
@@ -124,7 +125,7 @@ jobs:
     - name: Docker System Prune
       run: |
         podman system prune --force --all
-  build-python3-11-3006-isalt:
+  build-python3-11-3007-isalt:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: pcm0
@@ -142,7 +143,7 @@ jobs:
       continue-on-error: true
       run: |
         podman pull python:3.11-alpine
-        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006-isalt.txt . \
+        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007-isalt.txt . \
                      -t docker.io/pcm0/salt:3.11-latest-isalt-alpine \
                      -t docker.io/pcm0/salt:3.11-${{ env.BUILD }}-isalt-alpine \
                      -t docker.io/pcm0/salt:3.11-latest-isalt \
@@ -178,4 +179,4 @@ jobs:
           podman pull docker.io/pcm0/salt:3.11-${{ env.BUILD }}-alpine
     - name: Docker System Prune
       run: |
-        podman system prune --force --all
+        podman system prune --force --all
diff --git a/.github/workflows/unstable.yaml b/.github/workflows/unstable.yaml
@@ -434,8 +434,7 @@ jobs:
       run: |
         podman system prune --force --all
 
-
-  build-python3-12-3006:
+  build-python3-12-3007:
     runs-on: ubuntu-22.04
     env:
       DOCKER_USERNAME: pcm0
@@ -451,9 +450,9 @@ jobs:
     - name: Python 3.12
       run: |
         podman pull python:3.12-alpine
-        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006.txt . \
-                     -t docker.io/pcm0/salt:3.12-3006-${{ env.SHORT_SHA }}-alpine \
-                     -t $ACR_URL/pmartin47/salt:3.12-3006-${{ env.SHORT_SHA }}-alpine
+        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007.txt . \
+                      -t docker.io/pcm0/salt:3.12-3007-${{ env.SHORT_SHA }}-alpine \
+                      -t $ACR_URL/pmartin47/salt:3.12-3007-${{ env.SHORT_SHA }}-alpine
     - name: Push to Docker Hub
       run: |
         podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
@@ -465,7 +464,7 @@ jobs:
       run: |
         podman system prune --force --all
 
-  build-python3-12-3006-isalt:
+  build-python3-12-3007-isalt:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: pcm0
@@ -481,9 +480,9 @@ jobs:
     - name: Python 3.12
       run: |
         podman pull python:3.12-alpine
-        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006-isalt.txt . \
-                     -t docker.io/pcm0/salt:3.12-3006-${{ env.SHORT_SHA }}-isalt-alpine \
-                     -t $ACR_URL/pmartin47/salt:3.12-3006-${{ env.SHORT_SHA }}-isalt-alpine
+        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007-isalt.txt . \
+                      -t docker.io/pcm0/salt:3.12-3007-${{ env.SHORT_SHA }}-isalt-alpine \
+                      -t $ACR_URL/pmartin47/salt:3.12-3007-${{ env.SHORT_SHA }}-isalt-alpine
     - name: Push to Docker Hub
       run: |
         podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
@@ -495,7 +494,7 @@ jobs:
       run: |
         podman system prune --force --all
 
-  build-python3-11-3006:
+  build-python3-11-3007:
     runs-on: ubuntu-22.04
     env:
       DOCKER_USERNAME: pcm0
@@ -511,9 +510,9 @@ jobs:
     - name: Python 3.11
       run: |
         podman pull python:3.11-alpine
-        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006.txt . \
-                     -t docker.io/pcm0/salt:3.11-3006-${{ env.SHORT_SHA }}-alpine \
-                     -t $ACR_URL/pmartin47/salt:3.11-3006-${{ env.SHORT_SHA }}-alpine
+        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007.txt . \
+                      -t docker.io/pcm0/salt:3.11-3007-${{ env.SHORT_SHA }}-alpine \
+                      -t $ACR_URL/pmartin47/salt:3.11-3007-${{ env.SHORT_SHA }}-alpine
     - name: Push to Docker Hub
       run: |
         podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
@@ -525,7 +524,7 @@ jobs:
       run: |
         podman system prune --force --all
 
-  build-python3-11-3006-isalt:
+  build-python3-11-3007-isalt:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: pcm0
@@ -541,9 +540,69 @@ jobs:
     - name: Python 3.11
       run: |
         podman pull python:3.11-alpine
-        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006-isalt.txt . \
-                     -t docker.io/pcm0/salt:3.11-3006-${{ env.SHORT_SHA }}-isalt-alpine \
-                     -t $ACR_URL/pmartin47/salt:3.11-3006-${{ env.SHORT_SHA }}-isalt-alpine
+        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3007-isalt.txt . \
+                      -t docker.io/pcm0/salt:3.11-3007-${{ env.SHORT_SHA }}-isalt-alpine \
+                      -t $ACR_URL/pmartin47/salt:3.11-3007-${{ env.SHORT_SHA }}-isalt-alpine
+    - name: Push to Docker Hub
+      run: |
+        podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
+        podman images | awk "/docker.io\/pcm0\/salt/&&/${{ env.SHORT_SHA }}/ { print \$1\":\"\$2 }" | xargs -I {} podman push {}
+        podman logout
+        podman login $ACR_URL --username $ACR_USERNAME --password $ACR_PASSWORD
+        podman images | awk "/$ACR_URL\/pmartin47\/salt/&&/${{ env.SHORT_SHA }}/ { print \$1\":\"\$2 }" | xargs -I {} podman push {}
+    - name: Docker System Prune
+      run: |
+        podman system prune --force --all     
+
+  build-python3-12-3006:
+    runs-on: ubuntu-22.04
+    env:
+      DOCKER_USERNAME: pcm0
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      ACR_URL: ${{ secrets.ACR_URL }}
+      ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+      ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Get Build Version
+      run: |
+        echo "SHORT_SHA=${GITHUB_SHA:0:7}" | tee -a $GITHUB_ENV
+    - name: Python 3.12
+      run: |
+        podman pull python:3.12-alpine
+        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006.txt . \
+                     -t docker.io/pcm0/salt:3.12-3006-${{ env.SHORT_SHA }}-alpine \
+                     -t $ACR_URL/pmartin47/salt:3.12-3006-${{ env.SHORT_SHA }}-alpine
+    - name: Push to Docker Hub
+      run: |
+        podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
+        podman images | awk "/docker.io\/pcm0\/salt/&&/${{ env.SHORT_SHA }}/ { print \$1\":\"\$2 }" | xargs -I {} podman push {}
+        podman logout
+        podman login $ACR_URL --username $ACR_USERNAME --password $ACR_PASSWORD
+        podman images | awk "/$ACR_URL\/pmartin47\/salt/&&/${{ env.SHORT_SHA }}/ { print \$1\":\"\$2 }" | xargs -I {} podman push {}
+    - name: Docker System Prune
+      run: |
+        podman system prune --force --all
+
+  build-python3-12-3006-isalt:
+    runs-on: ubuntu-latest
+    env:
+      DOCKER_USERNAME: pcm0
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+      ACR_URL: ${{ secrets.ACR_URL }}
+      ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+      ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Get Build Version
+      run: |
+        echo "SHORT_SHA=${GITHUB_SHA:0:7}" | tee -a $GITHUB_ENV
+    - name: Python 3.12
+      run: |
+        podman pull python:3.12-alpine
+        podman build -f Python-3.12-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006-isalt.txt . \
+                     -t docker.io/pcm0/salt:3.12-3006-${{ env.SHORT_SHA }}-isalt-alpine \
+                     -t $ACR_URL/pmartin47/salt:3.12-3006-${{ env.SHORT_SHA }}-isalt-alpine
     - name: Push to Docker Hub
       run: |
         podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
@@ -555,7 +614,7 @@ jobs:
       run: |
         podman system prune --force --all
 
-  build-python3-11-3005:
+  build-python3-11-3006:
     runs-on: ubuntu-22.04
     env:
       DOCKER_USERNAME: pcm0
@@ -571,9 +630,9 @@ jobs:
     - name: Python 3.11
       run: |
         podman pull python:3.11-alpine
-        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3005.txt . \
-                     -t docker.io/pcm0/salt:3.11-3005-${{ env.SHORT_SHA }}-alpine \
-                     -t $ACR_URL/pmartin47/salt:3.11-3005-${{ env.SHORT_SHA }}-alpine
+        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006.txt . \
+                     -t docker.io/pcm0/salt:3.11-3006-${{ env.SHORT_SHA }}-alpine \
+                     -t $ACR_URL/pmartin47/salt:3.11-3006-${{ env.SHORT_SHA }}-alpine
     - name: Push to Docker Hub
       run: |
         podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
@@ -585,7 +644,7 @@ jobs:
       run: |
         podman system prune --force --all
 
-  build-python3-11-3005-isalt:
+  build-python3-11-3006-isalt:
     runs-on: ubuntu-latest
     env:
       DOCKER_USERNAME: pcm0
@@ -601,9 +660,9 @@ jobs:
     - name: Python 3.11
       run: |
         podman pull python:3.11-alpine
-        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3005-isalt.txt . \
-                     -t docker.io/pcm0/salt:3.11-3005-${{ env.SHORT_SHA }}-isalt-alpine \
-                     -t $ACR_URL/pmartin47/salt:3.11-3005-${{ env.SHORT_SHA }}-isalt-alpine
+        podman build -f Python-3.11-alpine.dockerfile --build-arg FLAGS='--no-deps' --build-arg REQUIREMENTS=requirements-3006-isalt.txt . \
+                     -t docker.io/pcm0/salt:3.11-3006-${{ env.SHORT_SHA }}-isalt-alpine \
+                     -t $ACR_URL/pmartin47/salt:3.11-3006-${{ env.SHORT_SHA }}-isalt-alpine
     - name: Push to Docker Hub
       run: |
         podman login docker.io --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
@@ -614,3 +673,4 @@ jobs:
     - name: Docker System Prune
       run: |
         podman system prune --force --all
+