Update docker to use buildx multiplatform

myoung34 · Jan 7, 2020 · 55094af · 55094af
1 parent db35b2c
commit 55094af
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 34 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -28,27 +28,20 @@ jobs:
       run: echo "::set-env name=PYTHONPATH::$(pwd)"
     - name: pytest
       run: py.test --cov-config .coveragerc --cov tilty --cov-report term-missing --cov-report xml --junitxml junit.xml tests
-  latest_deploy_x86:
+  latest_deploy:
     runs-on: ubuntu-latest
     needs: [test]
     steps:
     - name: Copy Repo Files
       uses: actions/checkout@master
-    - name: Build
-      run: docker build -t myoung34/tilty:latest .
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v1
+      with:
+        version: latest
+    - name: Available platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Login
       run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_TOKEN }}
-    - name: Push to hub registry
-      run: docker push myoung34/tilty:latest
-  latest_deploy_arm:
-    runs-on: self-hosted
-    needs: [test]
-    steps:
-    - name: Copy Repo Files
-      uses: actions/checkout@master
     - name: Build
-      run: docker build -t myoung34/tilty:latest-arm .
-    - name: Login
-      run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_TOKEN }}
-    - name: Push to hub registry
-      run: docker push myoung34/tilty:latest-arm
+      run: docker buildx build -t myoung34/tilty:latest --output "type=image,push=true" --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 .
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -47,31 +47,22 @@ jobs:
       env:
         TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
         TWINE_PASSWORD : ${{ secrets.TWINE_PASSWORD }}
-  ubuntu_tag_deploy_x86:
+  ubuntu_tag_deploy:
     runs-on: ubuntu-latest
     needs: [test]
     steps:
     - name: Copy Repo Files
       uses: actions/checkout@master
     - name: get version
       run: echo "::set-env name=TAG::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g")"
-    - name: Build
-      run: docker build -t myoung34/tilty:${TAG} .
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: crazy-max/ghaction-docker-buildx@v1
+      with:
+        version: latest
+    - name: Available platforms
+      run: echo ${{ steps.buildx.outputs.platforms }}
     - name: Login
       run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_TOKEN }}
-    - name: Push to hub registry
-      run: docker push myoung34/tilty:${TAG}
-  ubuntu_tag_deploy_arm:
-    runs-on: self-hosted
-    needs: [test]
-    steps:
-    - name: Copy Repo Files
-      uses: actions/checkout@master
-    - name: get version
-      run: echo "::set-env name=TAG::$(echo ${GITHUB_REF} | sed -e "s/refs\/tags\///g")"
     - name: Build
-      run: docker build -t myoung34/tilty:${TAG}-arm .
-    - name: Login
-      run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_TOKEN }}
-    - name: Push to hub registry
-      run: docker push myoung34/tilty:${TAG}-arm
+      run: docker buildx build -t myoung34/tilty:${TAG} --output "type=image,push=true" --platform linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64 .