diff --git a/.github/actions/build-steps/action.yml b/.github/actions/build-steps/action.yml deleted file mode 100644 index f60b11921..000000000 --- a/.github/actions/build-steps/action.yml +++ /dev/null @@ -1,75 +0,0 @@ -name: Build Steps - -on: - workflow_call: - inputs: - platform: - required: true - type: string - registry_image: - required: true - type: string - runtime: - required: true - type: string - buildpack: - required: true - type: string - -runs: - using: composite - - steps: - - - name: Prepare Platform Environment - run: | - platform=${{ inputs.platform }} - echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - - name: Checkout - uses: actions/checkout@v4 - - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ inputs.registry_image }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push by digest - id: build - uses: docker/build-push-action@v5 - with: - context: . - file: ./deployments/Dockerfile - platforms: ${{ inputs.platform }} - labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,name=${{ inputs.registry_image }},push-by-digest=true,name-canonical=true,push=true - build-args: | - RUNTIME=${{ inputs.runtime }} - BUILDPACK=${{ inputs.buildpack }} - - - name: Export digest - run: | - mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ env.PLATFORM_PAIR }} - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 diff --git a/.github/workflows/build-steps.yml b/.github/workflows/build-steps.yml new file mode 100644 index 000000000..7d8804abe --- /dev/null +++ b/.github/workflows/build-steps.yml @@ -0,0 +1,74 @@ +name: Build Steps + +on: + workflow_call: + inputs: + platform: + required: true + type: string + registry_image: + required: true + type: string + runtime: + required: true + type: string + buildpack: + required: true + type: string + +jobs: + build: + steps: + - + name: Prepare Platform Environment + run: | + platform=${{ inputs.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + - + name: Checkout + uses: actions/checkout@v4 + - + name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ inputs.registry_image }} + - + name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - + name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push by digest + id: build + uses: docker/build-push-action@v5 + with: + context: . + file: ./deployments/Dockerfile + platforms: ${{ inputs.platform }} + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,name=${{ inputs.registry_image }},push-by-digest=true,name-canonical=true,push=true + build-args: | + RUNTIME=${{ inputs.runtime }} + BUILDPACK=${{ inputs.buildpack }} + - + name: Export digest + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + - + name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 diff --git a/.github/workflows/push-image.yml b/.github/workflows/push-image.yml index a241ef6f0..e3b660ce3 100644 --- a/.github/workflows/push-image.yml +++ b/.github/workflows/push-image.yml @@ -27,7 +27,7 @@ jobs: run: echo "PLATFORM_PAIR=linux-amd64" >> $GITHUB_ENV - name: Execute Build Steps - uses: ./.github/actions/build-steps + uses: ./.github/workflows/build-steps.yml with: platform: linux/amd64 registry_image: ${{ env.REGISTRY_IMAGE }} @@ -44,7 +44,7 @@ jobs: run: echo "PLATFORM_PAIR=linux-arm64" >> $GITHUB_ENV - name: Execute Build Steps - uses: ./.github/actions/build-steps + uses: ./.github/workflows/build-steps.yml with: platform: linux/arm64 registry_image: ${{ env.REGISTRY_IMAGE }}