diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c56b16..e0ee9bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,114 +6,19 @@ on: - '**' workflow_dispatch: -env: - BUILD_SUFFIX: -build-${{ github.run_id }}_${{ github.run_attempt }} - DOCKER_METADATA_SET_OUTPUT_ENV: 'true' - jobs: - build: - runs-on: ${{ matrix.runner }} - outputs: - image-arm64: ${{ steps.gen-output.outputs.image-arm64 }} - image-x64: ${{ steps.gen-output.outputs.image-x64 }} - strategy: - fail-fast: false - matrix: - runner: - - ubuntu-24.04 - - ubuntu-24.04-arm - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - id: build-meta - name: Docker meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/${{ github.repository }} - tags: type=sha,suffix=${{ env.BUILD_SUFFIX }} - - # Build cache is shared among all builds of the same architecture - - id: cache-meta - name: Docker meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/${{ github.repository }} - tags: type=raw,value=buildcache-${{ runner.arch }} - - - id: get-registry - name: Get the sanitized registry name - run: | - echo "registry=$(echo '${{ steps.build-meta.outputs.tags }}' | cut -f1 -d:)" | tee -a "$GITHUB_OUTPUT" - - - id: build - name: Build/push the arch-specific image - uses: docker/build-push-action@v6 - with: - cache-from: type=registry,ref=${{ steps.cache-meta.outputs.tags }} - cache-to: type=registry,ref=${{ steps.cache-meta.outputs.tags }},mode=max - labels: ${{ steps.build-meta.outputs.labels }} - provenance: mode=max - sbom: true - tags: ${{ steps.get-registry.outputs.registry }} - outputs: type=image,push-by-digest=true,push=true - - - id: gen-output - name: Write arch-specific image digest to outputs - run: | - echo "image-${RUNNER_ARCH,,}=${{ steps.get-registry.outputs.registry }}@${{ steps.build.outputs.digest }}" | tee -a "$GITHUB_OUTPUT" - - merge: - runs-on: ubuntu-24.04 - needs: build - env: - DOCKER_APP_IMAGE_ARM64: ${{ needs.build.outputs.image-arm64 }} - DOCKER_APP_IMAGE_X64: ${{ needs.build.outputs.image-x64 }} - outputs: - image: ${{ steps.meta.outputs.tags }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - id: meta - name: Generate tag for the app image - uses: docker/metadata-action@v5 - with: - images: ghcr.io/${{ github.repository }} - tags: type=sha,suffix=${{ env.BUILD_SUFFIX }} - - - name: Push the multi-platform app image - run: | - docker buildx imagetools create \ - --tag "$DOCKER_METADATA_OUTPUT_TAGS" \ - "$DOCKER_APP_IMAGE_ARM64" "$DOCKER_APP_IMAGE_X64" + docker-build: + uses: BerkeleyLibrary/.github/.github/workflows/docker-build.yml@3.2.0 + with: + image: ghcr.io/${{ github.repository }} + secrets: inherit test: runs-on: ubuntu-24.04 - needs: merge + needs: docker-build env: - COMPOSE_FILE: docker-compose.yml:docker-compose.ci.yml - DOCKER_APP_IMAGE: ${{ needs.merge.outputs.image }} + COMPOSE_FILE: compose.yml:compose.ci.yml + DOCKER_APP_IMAGE: ${{ needs.docker-build.outputs.image }} steps: - name: Checkout code uses: actions/checkout@v4 @@ -134,34 +39,12 @@ jobs: ./test/run_tests.sh push: - runs-on: ubuntu-24.04 needs: - - merge + - docker-build - test - env: - DOCKER_APP_IMAGE: ${{ needs.merge.outputs.image }} - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Produce permanent image tags - uses: docker/metadata-action@v5 - with: - images: ghcr.io/${{ github.repository }} - tags: | - type=sha - type=ref,event=branch - type=raw,value=latest,enable={{is_default_branch}} - - - name: Retag and push the image - run: | - docker pull --quiet "$DOCKER_APP_IMAGE" - echo "$DOCKER_METADATA_OUTPUT_TAGS" | tr ' ' '\n' | xargs -n1 docker tag "$DOCKER_APP_IMAGE" - docker push --all-tags "$(echo "$DOCKER_APP_IMAGE" | cut -f1 -d:)" + uses: BerkeleyLibrary/.github/.github/workflows/docker-push.yml@3.2.0 + with: + image: ghcr.io/${{ github.repository }} + build-image-arm64: ${{ needs.docker-build.outputs.image-arm64 }} + build-image-x64: ${{ needs.docker-build.outputs.image-x64 }} + secrets: inherit diff --git a/docker-compose.ci.yml b/compose.ci.yml similarity index 100% rename from docker-compose.ci.yml rename to compose.ci.yml diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml