added amd64 platform, moved python versions into matrix in gha

.github/workflows/deploy-3.12.yaml → .github/workflows/deploy-images.yml

@@ -1,4 +1,4 @@
-name: Deploy Python 3.12 Image
+name: Deploy All Images
 
 env:
   REGISTRY: ghcr.io
@@ -11,7 +11,10 @@ on:
       - master
 
 jobs:
-  public-py312-image:
+  public-image:
+    strategy:
+      matrix:
+        python-version: ['3{0}10', '3{0}11', '3{0}12']
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -23,37 +26,46 @@ jobs:
         run: echo "GIT_REF=`git rev-parse --short HEAD`" >> $GITHUB_ENV
 
       - name: Log in to Github Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_3_12
+          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_${{ format(matrix.python-version, '_') }}
 
       - name: Push Docker image as LATEST to Github Container registry
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./py3.12/Dockerfile
+          file: ./py${{ format(matrix.python-version, '.') }}/Dockerfile
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_3_12:latest
+          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_${{ format(matrix.python-version, '_') }}:latest
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Push Docker image git ref to Github Container registry
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./py3.12/Dockerfile
+          file: ./py${{ format(matrix.python-version, '.') }}/Dockerfile
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_3_12:${{ env.GIT_REF }}
+          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_${{ format(matrix.python-version, '_') }}:${{ env.GIT_REF }}
           labels: ${{ steps.meta.outputs.labels }}
 
   internal-py312-image:
+    strategy:
+      matrix:
+        python-version: ['3{0}10', '3{0}11', '3{0}12']
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -67,5 +79,11 @@ jobs:
           role-to-assume: arn:aws:iam::${{ secrets.MODEL_UPLOADS_ACCOUNT_ID }}:role/github-actions
           aws-region: us-west-2
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and Push Docker Image
-        run: ACCOUNT_ID=${{ secrets.MODEL_UPLOADS_ACCOUNT_ID }} make push_latest_3_12
+        run: ACCOUNT_ID=${{ secrets.MODEL_UPLOADS_ACCOUNT_ID }} make push_latest_${{ format(matrix.python-version, '_') }}

.github/workflows/deploy-shell.yaml

@@ -1,4 +1,4 @@
-name: Deploy Python 3.11 Image
+name: Deploy Shell Image (3.11 only)
 
 env:
   REGISTRY: ghcr.io
@@ -23,20 +23,26 @@ jobs:
         run: echo "GIT_REF=`git rev-parse --short HEAD`" >> $GITHUB_ENV
 
       - name: Log in to Github Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_shell
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Push Docker image as LATEST to Github Container registry
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./py3.11/Dockerfile
@@ -45,7 +51,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Push Docker image git ref to Github Container registry
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./py3.11/Dockerfile

.github/workflows/deploy-3-11.yaml → .github/workflows/deploy-stable.yaml

@@ -1,4 +1,4 @@
-name: Deploy Python 3.11 Image
+name: Deploy All Stable Releases
 
 env:
   REGISTRY: ghcr.io
@@ -7,53 +7,53 @@ env:
 on:
   workflow_dispatch:
   push:
-    branches:
-      - master
+    branches: 
+      - 'stable'
 
 jobs:
-  public-py311-image:
+  public-image:
+    strategy:
+      matrix:
+        python-version: ['3{0}10', '3{0}11', '3{0}12']
     runs-on: ubuntu-latest
     permissions:
       packages: write
       contents: read
     steps:
       - uses: actions/checkout@v2
 
-      - name: Extract short git SHA
-        run: echo "GIT_REF=`git rev-parse --short HEAD`" >> $GITHUB_ENV
-
       - name: Log in to Github Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_3_11
+          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_${{ format(matrix.python-version, '_') }}
 
-      - name: Push Docker image as LATEST to Github Container registry
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
-        with:
-          context: .
-          file: ./py3.11/Dockerfile
-          push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_3_11:latest
-          labels: ${{ steps.meta.outputs.labels }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Push Docker image git ref to Github Container registry
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      - name: Push Docker image to Github Container registry
+        uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./py3.11/Dockerfile
+          file: ./${{ format(matrix.python-version, '.') }}/Dockerfile
           push: true
-          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_3_11:${{ env.GIT_REF }}
+          tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}_py_${{ format(matrix.python-version, '_') }}:stable
           labels: ${{ steps.meta.outputs.labels }}
 
-  internal-py311-image:
+  internal-image:
+    strategy:
+      matrix:
+        python-version: ['3{0}10', '3{0}11', '3{0}12']
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -68,4 +68,4 @@ jobs:
           aws-region: us-west-2
 
       - name: Build and Push Docker Image
-        run: ACCOUNT_ID=${{ secrets.MODEL_UPLOADS_ACCOUNT_ID }} make push_latest_3_11
+        run: ACCOUNT_ID=${{ secrets.MODEL_UPLOADS_ACCOUNT_ID }} make push_latest_${{ format(matrix.python-version, '_') }}