From 884748ff53b60cb268273d4d69a082f2633ac1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Borja=20Garc=C3=ADa=20Rodr=C3=ADguez?=
 <bgarcia@plainconcepts.com>
Date: Thu, 24 Dec 2020 12:50:42 +0100
Subject: [PATCH] test WIP

---
 .github/workflows/basket-api.yml | 79 +++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/basket-api.yml b/.github/workflows/basket-api.yml
index 952549706..3c7aa8621 100644
--- a/.github/workflows/basket-api.yml
+++ b/.github/workflows/basket-api.yml
@@ -18,7 +18,8 @@ on:
 env:
   REGISTRY_ENDPOINT: borjasanes
   REGISTRY_HOST: docker.io
-  SERVICES: basket-api
+  SERVICE: basket-api
+  IMAGE: basket.api
 
 jobs:
 
@@ -29,8 +30,8 @@ jobs:
     - name: 'Checkout Github Action'
       uses: actions/checkout@master
       
-    - name: Compose build ${{ env.SERVICES }}
-      run: sudo -E docker-compose build ${{ env.SERVICES }}
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
       working-directory: ./src
       shell: bash
       env:
@@ -45,8 +46,8 @@ jobs:
     - name: 'Checkout Github Action'
       uses: actions/checkout@master
 
-    - name: Compose build ${{ env.SERVICES  }}
-      run: docker-compose build ${{ env.SERVICES }}
+    - name: Compose build ${{ env.SERVICE  }}
+      run: docker-compose build ${{ env.SERVICE }}
       working-directory: ./src
       shell: pwsh
       env:
@@ -54,10 +55,7 @@ jobs:
         REGISTRY: ${{ env.REGISTRY_ENDPOINT }}
         PLATFORM: win
         NODE_IMAGE: stefanscherer/node-windows:10
-  
   BuildLinux:
-    env:
-      DOCKER_CONFIG: $HOME/.docker
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }}
     steps:
@@ -78,33 +76,22 @@ jobs:
         echo "BRANCH=$currentbranch" >> $GITHUB_ENV
       shell: bash
 
-    - name: Compose build ${{ env.SERVICES }}
-      run: sudo -E docker-compose build ${{ env.SERVICES }}
+    - name: Compose build ${{ env.SERVICE }}
+      run: sudo -E docker-compose build ${{ env.SERVICE }}
       working-directory: ./src
       shell: bash
       env:
         TAG: ${{ env.BRANCH }}
         REGISTRY: ${{ env.REGISTRY_ENDPOINT }}
 
-    - name: Compose push ${{ env.SERVICES }}
-      run: sudo -E docker-compose push ${{ env.SERVICES }}
+    - name: Compose push ${{ env.SERVICE }}
+      run: sudo -E docker-compose push ${{ env.SERVICE }}
       working-directory: ./src
       shell: bash
       env:
         TAG: ${{ env.BRANCH }}
         REGISTRY: ${{ env.REGISTRY_ENDPOINT }}
 
-    - name: Create multiarch manifest
-      run: |
-        mkdir -p ~/.docker
-        sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
-        echo ',"experimental": "enabled" }' >> ~/.docker/config.json
-        docker --config ~/.docker manifest create ${{ env.REGISTRY_ENDPOINT  }}/${{ env.SERVICES  }}:${{ env.BRANCH  }} ${{ env.REGISTRY_ENDPOINT  }}/${{ env.SERVICES  }}:linux-${{ env.BRANCH  }}
-        docker --config ~/.docker manifest create ${{ env.REGISTRY_ENDPOINT  }}/${{ env.SERVICES  }}:latest ${{ env.REGISTRY_ENDPOINT  }}/${{ env.SERVICES  }}:linux-latest
-        docker --config ~/.docker manifest push ${{ env.REGISTRY_ENDPOINT  }}/${{ env.SERVICES  }}:${{ env.BRANCH  }}
-        docker --config ~/.docker manifest push ${{ env.REGISTRY_ENDPOINT  }}/${{ env.SERVICES  }}:latest
-      shell: bash
-
   BuildWindows:
     runs-on: windows-2019
     if:  ${{ false }}
@@ -124,18 +111,54 @@ jobs:
       shell: pwsh
       run: echo "BRANCH=$($env:GITHUB_REF.replace('refs/heads/', ''))" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-    - name: Compose build ${{ env.SERVICES }}
-      run: docker-compose build ${{ env.SERVICES }}
+    - name: Compose build ${{ env.SERVICE }}
+      run: docker-compose build ${{ env.SERVICE }}
       working-directory: ./src
       shell: pwsh
       env:
         TAG: ${{ env.BRANCH }}
         REGISTRY: ${{ env.REGISTRY_ENDPOINT }}
 
-    - name: Compose push ${{ env.SERVICES }}
-      run: docker-compose push ${{ env.SERVICES }}'
+    - name: Compose push ${{ env.SERVICE }}
+      run: docker-compose push ${{ env.SERVICE }}'
       working-directory: ./src
       shell: pwsh
       env:
         TAG: ${{ env.BRANCH }}
-        REGISTRY: ${{ env.REGISTRY_ENDPOINT }} 
\ No newline at end of file
+        REGISTRY: ${{ env.REGISTRY_ENDPOINT }}
+  
+  BuildMultiarch:
+    env:
+      DOCKER_CONFIG: $HOME/.docker
+    runs-on: ubuntu-latest
+    needs:
+    - BuildLinux
+    if: ${{ github.event_name != 'pull_request' }}
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Login to Container Registry
+      uses: docker/login-action@v1
+      with:
+        registry: ${{ env.REGISTRY_HOST }}
+        username: ${{ secrets.USERNAME }}
+        password: ${{ secrets.PASSWORD }}
+
+    - name: Set branch name as env variable
+      run: |
+        currentbranch=$(echo ${GITHUB_REF##*/})
+        echo "running on $currentbranch"
+        echo "BRANCH=$currentbranch" >> $GITHUB_ENV
+      shell: bash
+
+    - name: Create multiarch manifest
+      run: |
+        mkdir -p ~/.docker
+        sed '$ s/.$//' $DOCKER_CONFIG/config.json > ~/.docker/config.json
+        echo ',"experimental": "enabled" }' >> ~/.docker/config.json
+        docker --config ~/.docker manifest create ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }} ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-${{ env.BRANCH  }}
+        docker --config ~/.docker manifest create ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:latest ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:linux-latest
+        docker --config ~/.docker manifest push ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:${{ env.BRANCH  }}
+        docker --config ~/.docker manifest push ${{ env.REGISTRY_ENDPOINT  }}/${{ env.IMAGE  }}:latest
+      shell: bash
+                    
\ No newline at end of file