Skip to content
This repository has been archived by the owner on Sep 22, 2023. It is now read-only.

Commit

Permalink
update Dockerfile to reference TARGETARCH for build selection
Browse files Browse the repository at this point in the history
  • Loading branch information
itsmostafa committed Feb 9, 2023
1 parent b899561 commit efa6194
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
31 changes: 15 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ env:
CURL_CACHE_DIR: ~/.cache/curl
IMAGE_NAME: cisagov/con-pca-tasks
PIP_CACHE_DIR: ~/.cache/pip
PLATFORMS: "linux/amd64,linux/arm/v6,linux/arm/v7,\
linux/arm64,linux/ppc64le,linux/s390x"
PLATFORMS: "linux/amd64,linux/arm64"
PRE_COMMIT_CACHE_DIR: ~/.cache/pre-commit
RUN_TMATE: ${{ secrets.RUN_TMATE }}

Expand Down Expand Up @@ -262,27 +261,27 @@ jobs:
# https://github.com/opencontainers/image-spec/blob/master/annotations.md
labels: "\
org.opencontainers.image.created=${{
needs.prepare.outputs.created }}
needs.prepare.outputs.created }}
org.opencontainers.image.description=${{
fromJson(needs.prepare.outputs.repometa).description }}
fromJson(needs.prepare.outputs.repometa).description }}
org.opencontainers.image.licenses=${{
fromJson(needs.prepare.outputs.repometa).license.spdx_id }}
fromJson(needs.prepare.outputs.repometa).license.spdx_id }}
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.source=${{
fromJson(needs.prepare.outputs.repometa).clone_url }}
fromJson(needs.prepare.outputs.repometa).clone_url }}
org.opencontainers.image.title=${{
fromJson(needs.prepare.outputs.repometa).name }}
fromJson(needs.prepare.outputs.repometa).name }}
org.opencontainers.image.url=${{
fromJson(needs.prepare.outputs.repometa).html_url }}
fromJson(needs.prepare.outputs.repometa).html_url }}
org.opencontainers.image.version=${{
needs.prepare.outputs.source_version }}"
needs.prepare.outputs.source_version }}"
- name: Compress image
run: gzip dist/image.tar
- name: Upload artifacts
Expand Down Expand Up @@ -391,27 +390,27 @@ jobs:
# https://github.com/opencontainers/image-spec/blob/master/annotations.md
labels: "\
org.opencontainers.image.created=${{
needs.prepare.outputs.created }}
needs.prepare.outputs.created }}
org.opencontainers.image.description=${{
fromJson(needs.prepare.outputs.repometa).description }}
fromJson(needs.prepare.outputs.repometa).description }}
org.opencontainers.image.licenses=${{
fromJson(needs.prepare.outputs.repometa).license.spdx_id }}
fromJson(needs.prepare.outputs.repometa).license.spdx_id }}
org.opencontainers.image.revision=${{ github.sha }}
org.opencontainers.image.source=${{
fromJson(needs.prepare.outputs.repometa).clone_url }}
fromJson(needs.prepare.outputs.repometa).clone_url }}
org.opencontainers.image.title=${{
fromJson(needs.prepare.outputs.repometa).name }}
fromJson(needs.prepare.outputs.repometa).name }}
org.opencontainers.image.url=${{
fromJson(needs.prepare.outputs.repometa).html_url }}
fromJson(needs.prepare.outputs.repometa).html_url }}
org.opencontainers.image.version=${{
needs.prepare.outputs.source_version }}"
needs.prepare.outputs.source_version }}"
- name: Publish README.md to Docker Hub
env:
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ ARG VERSION
LABEL org.opencontainers.image.authors="mostafa.abdelbaky@inl.gov"
LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency"

# This argument is automatically set by the --platform flag
ARG TARGETARCH

###
# Unprivileged user setup variables
###
Expand Down Expand Up @@ -53,8 +56,8 @@ ENV DEPS \
RUN apk --no-cache --quiet add ${DEPS}

# Install Con-PCA-Tasks binary file
RUN wget https://github.com/cisagov/con-pca-tasks/releases/download/v0.0.1/pca-linux-amd64
RUN mv pca-linux-amd64 /bin/pca
RUN wget https://github.com/cisagov/con-pca-tasks/releases/download/v0.0.1/pca-linux-${TARGETARCH}
RUN mv pca-linux-${TARGETARCH} /bin/pca

RUN ["chmod", "+x", "/bin/pca"]
USER ${CISA_USER}
Expand Down

0 comments on commit efa6194

Please # to comment.