Merge pull request #1 from aleskandro/main

OCPQE-8067: Enable multiarch building for Dockerfile and $basearch on nginx.repo
openshift-qe · Jan 5, 2022 · 4c7321c · 4c7321c
2 parents a31b22c + a96269f
commit 4c7321c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,8 +1,8 @@
-FROM quay.io/openshifttest/origin-release:golang-1.9
+FROM golang:1.9
 COPY . /go/src/github.com/openshift/content-mirror/
 RUN GOPATH=/go go install github.com/openshift/content-mirror/cmd/content-mirror
 
-FROM quay.io/openshifttest/centos:7
+FROM quay.io/openshifttest/base-fedora:multiarch
 COPY --from=0 /go/bin/content-mirror /usr/bin/content-mirror
 COPY nginx.repo /etc/yum.repos.d/nginx.repo
 RUN INSTALL_PKGS=" \

diff --git a/nginx.repo b/nginx.repo
@@ -2,4 +2,4 @@
 name=nginx
 gpgcheck=0
 enabled=0
-baseurl=http://nginx.org/packages/mainline/centos/7/x86_64/
+baseurl=http://nginx.org/packages/mainline/centos/8/$basearch/