sandbox tag and docker registry

Author: nhsd-david-wass

.github/actions/build-proxies/action.yml

@@ -27,9 +27,11 @@ runs:
         then
           echo "INSTANCE=$PROXYGEN_API_NAME" >> $GITHUB_ENV
           echo "TARGET=https://suppliers.dev.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
+          echo "SANDBOX_TAG=latest" >> $GITHUB_ENV
         else
           echo "TARGET=https://pr$PR_NUMBER.suppliers.dev.nhsnotify.national.nhs.uk" >> $GITHUB_ENV
           echo "INSTANCE=$PROXYGEN_API_NAME-PR-$PR_NUMBER" >> $GITHUB_ENV
+          echo "SANDBOX_TAG=pr$PR_NUMBER" >> $GITHUB_ENV
         fi
 
 
@@ -71,6 +73,11 @@ runs:
       run: |
         make build-json-oas-spec APIM_ENV=sandbox
 
+    - name: Set docker tag
+      shell: bash
+      run: |
+        jq --arg newtag "$SANDBOX_TAG" '.["x-nhsd-apim"].target.containers[0].image.tag = $newtag' build/notify-supplier.json > build/notify-supplier_target.json && mv build/notify-supplier_target.json build/notify-supplier.json
+
     - name: Deploy to Internal Dev Sandbox
       shell: bash
       run: |

.github/actions/build-sandbox/action.yml

@@ -47,12 +47,23 @@ runs:
         envsubst < ./.github/proxygen-settings.yaml > ${HOME}/.proxygen/settings.yaml
         envsubst < ./.github/proxygen-settings.yaml | cat
 
+    - name: Setup Proxy Name and target
+      shell: bash
+      run: |
+        if [ -z $PR_NUMBER ]
+        then
+          echo "SANDBOX_TAG=latest" >> $GITHUB_ENV
+        else
+          echo "SANDBOX_TAG=pr$PR_NUMBER" >> $GITHUB_ENV
+        fi
+
     - name: Build and publish sandbox Docker image
       shell: bash
       working-directory: ./sandbox
       run: |
           proxygen docker get-login | bash
-          docker build -t nhs-notify-supplier:latest .
-          IMAGE_ID=$(docker images -q nhs-notify-supplier:latest)
-          docker tag $IMAGE_ID 958002497996.dkr.ecr.eu-west-2.amazonaws.com/nhs-notify-supplier:latest
-          docker push 958002497996.dkr.ecr.eu-west-2.amazonaws.com/nhs-notify-supplier:latest
+          docker build -t nhs-notify-supplier:$SANDBOX_TAG .
+          DOCKER_REGISTRY=$(proxygen docker registry | tail -1)
+          IMAGE_ID=$(docker images -q nhs-notify-supplier:$SANDBOX_TAG)
+          docker tag $IMAGE_ID $DOCKER_REGISTRY/nhs-notify-supplier:$SANDBOX_TAG
+          docker push $DOCKER_REGISTRY/nhs-notify-supplier:$SANDBOX_TAG

specification/api/components/x-nhsd-apim/target-sandbox.yml

@@ -4,7 +4,7 @@ containers:
   - name: nhs-notify-supplier
     image:
       name: nhs-notify-supplier
-      tag: latest
+      tag: pr99
     environment:
       LOG_LEVEL: info
       NODE_ENV: development