diff --git a/.github/workflows/development.yaml b/.github/workflows/development.yaml index 4c13d6a..bed8719 100644 --- a/.github/workflows/development.yaml +++ b/.github/workflows/development.yaml @@ -27,11 +27,11 @@ jobs: # Step 3: Build the Docker image - name: Build Docker image run: | - docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:latest -f ./Dockerfile . + docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:dev -f ./Dockerfile . # Step 4: Push Docker image to Docker Hub - name: Push Docker image to Docker Hub run: | - docker push ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:develop + docker push ${{ secrets.DOCKER_HUB_USERNAME }}/systemadmin:dev # Step 5: Trigger Azure Release Pipeline - name: Trigger Azure DevOps Pipeline uses: Azure/pipelines@v1.2 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7f246f4..f8ba2aa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,7 @@ steps: echo "Determining Azure subscription..." if [ "$(Build.SourceBranchName)" = "development" ]; then echo "##vso[task.setvariable variable=AZURE_SUBSCRIPTION]Dev-Gateway-Resources-MS" - echo "##vso[task.setvariable variable=DOCKER_IMAGE]attonbomb/systemadmin:develop" + echo "##vso[task.setvariable variable=DOCKER_IMAGE]attonbomb/systemadmin:dev" else echo "##vso[task.setvariable variable=AZURE_SUBSCRIPTION]Gateway-Resources-IAC-MI-Conn-2" fi @@ -39,7 +39,7 @@ steps: az containerapp update \ --name gateway-global-integration-ui-iac --resource-group Gateway-IAC-Resources - --image attonbomb/systemadmin:latest + --image $(DOCKER_IMAGE) --registry-server hub.docker.com echo "Global Integration API Container App updated successfully"