Skip to content

OCPQE-8067: Enable multiarch building for Dockerfile and $basearch on nginx.repo #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pruan-rht merged 1 commit into from
Jan 5, 2022
Merged

OCPQE-8067: Enable multiarch building for Dockerfile and $basearch on nginx.repo #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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=" \
Expand Down
2 changes: 1 addition & 1 deletion nginx.repo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/