Skip to content

Commit

Permalink
[COST-5214] Move TARGETARCH declaration to the top of the Dockerfile (#…
Browse files Browse the repository at this point in the history
…5195)

There is a bug in podman where this is only used correctly for the
multi-stage build if it is defined as the first line.

Update Jenkinsfile to use RHEL 8

Unfortunately this breaks the image build for Docker. I'll fix that in a followup PR.
  • Loading branch information
samdoran authored and djnakabaale committed Jul 9, 2024
1 parent 554a2d8 commit 3281bf0
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
ARG TARGETARCH

FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS base

USER root
Expand Down Expand Up @@ -61,8 +63,6 @@ RUN ldconfig
# No intermetiate steps for x86_64, but declare it so it can be used for the final image
FROM --platform=amd64 base AS stage-amd64

ARG TARGETARCH

FROM stage-${TARGETARCH} AS final
# PIPENV_DEV is set to true in the docker-compose allowing
# local builds to install the dev dependencies
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def secrets = [
def configuration = [vaultUrl: params.VAULT_ADDRESS, vaultCredentialId: params.VAULT_CREDS_ID, engineVersion: 1]

pipeline {
agent { label 'insights' }
agent { label 'rhel8' }
options {
timestamps()
}
Expand Down

0 comments on commit 3281bf0

Please sign in to comment.