diff --git a/.github/workflows/docker-build-test-upload.yaml b/.github/workflows/docker-build-test-upload.yaml index b7badc786..4bd3c4a79 100644 --- a/.github/workflows/docker-build-test-upload.yaml +++ b/.github/workflows/docker-build-test-upload.yaml @@ -31,31 +31,31 @@ jobs: runs-on: ubuntu-latest steps: - - name: Run Hadolint - run: | - sudo curl -L https://github.com/hadolint/hadolint/releases/download/v${{ env.HADOLINT_VERSION }}/hadolint-Linux-x86_64 --output hadolint - sudo chmod +x hadolint - ./hadolint images/${{ parent-image }}/Dockerfile - - - name: Echo disk usage before clean up - run: ./.github/scripts/echo_usage.sh - - - name: Free up all available disk space before building - run: ./.github/scripts/cleanup_runner.sh - - - name: Echo disk usage before build start - run: ./.github/scripts/echo_usage.sh - - # Connect to Azure Container registry (ACR) - - uses: azure/docker-login@v1 - with: - login-server: ${{ env.REGISTRY_NAME }}.azurecr.io - username: ${{ secrets.REGISTRY_USERNAME }} - password: ${{ secrets.REGISTRY_PASSWORD }} - - # Connect to Azure DEV Container registry (ACR) - - uses: azure/docker-login@v1 - with: - login-server: ${{ env.DEV_REGISTRY_NAME }}.azurecr.io - username: ${{ secrets.DEV_REGISTRY_USERNAME }} - password: ${{ secrets.DEV_REGISTRY_PASSWORD }} \ No newline at end of file + - name: Run Hadolint + run: | + sudo curl -L https://github.com/hadolint/hadolint/releases/download/v${{ env.HADOLINT_VERSION }}/hadolint-Linux-x86_64 --output hadolint + sudo chmod +x hadolint + ./hadolint images/${{ parent-image }}/Dockerfile + + - name: Echo disk usage before clean up + run: ./.github/scripts/echo_usage.sh + + - name: Free up all available disk space before building + run: ./.github/scripts/cleanup_runner.sh + + - name: Echo disk usage before build start + run: ./.github/scripts/echo_usage.sh + + # Connect to Azure Container registry (ACR) + - uses: azure/docker-login@v1 + with: + login-server: ${{ env.REGISTRY_NAME }}.azurecr.io + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} + + # Connect to Azure DEV Container registry (ACR) + - uses: azure/docker-login@v1 + with: + login-server: ${{ env.DEV_REGISTRY_NAME }}.azurecr.io + username: ${{ secrets.DEV_REGISTRY_USERNAME }} + password: ${{ secrets.DEV_REGISTRY_PASSWORD }} diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index dafbd4370..17ac41f30 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -26,4 +26,4 @@ jobs: uses: ./.github/workflows/docker-build-test-upload.yaml with: parent-image: "" - image: "base-cpu" \ No newline at end of file + image: "base-cpu"