Skip to content
This repository has been archived by the owner on Jan 8, 2024. It is now read-only.

Commit

Permalink
Merge https://github.com/cisagov/skeleton-docker into lineage/skeleton
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build.yml
  • Loading branch information
mcdonnnj committed Dec 7, 2023
2 parents d7af797 + 7e820ba commit 268765e
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ jobs:
- uses: actions/checkout@v4
- name: Gather repository metadata
id: repo
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
const repo = await github.rest.repos.get(context.repo)
Expand Down Expand Up @@ -320,7 +320,7 @@ jobs:
run: mkdir -p dist
- name: Build image
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
build-args: |
VERSION=${{ needs.prepare.outputs.source_version }}
Expand All @@ -329,8 +329,17 @@ jobs:
context: .
file: ./Dockerfile
outputs: type=docker,dest=dist/image.tar
<<<<<<< HEAD
# not to be pushed
tags: ${{ env.IMAGE_NAME }}:latest
=======
# Uncomment the following option if you are building an image for use
# on Google Cloud Run or AWS Lambda. The current default image output
# is unable to run on either. Please see the following issue for more
# information: https://github.com/docker/buildx/issues/1533
# provenance: false
tags: ${{ env.IMAGE_NAME }}:latest # not to be pushed
>>>>>>> 7e820ba36e8030eb16ed0ea94df5047c9dfbaf52
# For a list of pre-defined annotation keys and value types see:
# https://github.com/opencontainers/image-spec/blob/master/annotations.md
labels: "\
Expand Down Expand Up @@ -473,7 +482,7 @@ jobs:
run: ./buildx-dockerfile.sh
- name: Build and push platform images to registries
id: docker_build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
build-args: |
VERSION=${{ needs.prepare.outputs.source_version }}
Expand All @@ -482,6 +491,11 @@ jobs:
context: .
file: ./Dockerfile-x
platforms: ${{ env.PLATFORMS }}
# Uncomment the following option if you are building an image for use
# on Google Cloud Run or AWS Lambda. The current default image output
# is unable to run on either. Please see the following issue for more
# information: https://github.com/docker/buildx/issues/1533
# provenance: false
push: true
tags: ${{ needs.prepare.outputs.tags }}
# For a list of pre-defined annotation keys and value types see:
Expand Down

0 comments on commit 268765e

Please sign in to comment.