Skip to content

Commit 4eddf8e

Browse files
authored
[COST-5214] Move TARGETARCH declaration to the top of the Dockerfile (#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.
1 parent 4baa511 commit 4eddf8e

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
ARG TARGETARCH
2+
13
FROM registry.access.redhat.com/ubi8/ubi-minimal:latest AS base
24

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

64-
ARG TARGETARCH
65-
6666
FROM stage-${TARGETARCH} AS final
6767
# PIPENV_DEV is set to true in the docker-compose allowing
6868
# local builds to install the dev dependencies

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def secrets = [
2222
def configuration = [vaultUrl: params.VAULT_ADDRESS, vaultCredentialId: params.VAULT_CREDS_ID, engineVersion: 1]
2323

2424
pipeline {
25-
agent { label 'insights' }
25+
agent { label 'rhel8' }
2626
options {
2727
timestamps()
2828
}

0 commit comments

Comments
 (0)