Skip to content

Bug 1872080: Updating Dockerfile.rhel8 baseimages to mach ocp-build-data config. #151

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
openshift-merge-robot merged 1 commit into from
Aug 26, 2020
Merged

Bug 1872080: Updating Dockerfile.rhel8 baseimages to mach ocp-build-data config. #151

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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/_o
COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/assets ${APP_ROOT}
COPY --from=tuned /root/rpmbuild/RPMS/noarch /root/rpms
RUN INSTALL_PKGS=" \
socat \
socat procps-ng \
" && \
mkdir -p /etc/grub.d/ /boot && \
yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rhel7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/_o
COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/assets ${APP_ROOT}
COPY --from=tuned /root/rpmbuild/RPMS/noarch /root/rpms
RUN INSTALL_PKGS=" \
socat \
socat procps-ng \
" && \
mkdir -p /etc/grub.d/ /boot && \
yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS && \
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.rhel8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/github.com/openshift/cluster-node-tuning-operator
COPY . .
RUN make build

FROM registry.svc.ci.openshift.org/ocp/4.6:base AS tuned
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-base-openshift-4.6 AS tuned
WORKDIR /root
COPY assets/tuned /root
RUN INSTALL_PKGS=" \
Expand All @@ -27,7 +27,7 @@ COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/_o
COPY --from=builder /go/src/github.com/openshift/cluster-node-tuning-operator/assets ${APP_ROOT}
COPY --from=tuned /root/rpmbuild/RPMS/noarch /root/rpms
RUN INSTALL_PKGS=" \
socat \
socat procps-ng \
" && \
mkdir -p /etc/grub.d/ /boot && \
yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS && \
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func GetSysctl(sysctlVar string, pod *corev1.Pod) (string, error) {
out, err = exec.Command("oc", "rsh", "-n", ntoconfig.OperatorNamespace(), pod.Name,
"sysctl", "-n", sysctlVar).CombinedOutput()
if err != nil {
explain = fmt.Sprintf("failed to query sysctl %s on %s", sysctlVar, pod.Name)
explain = fmt.Sprintf("out=%s; err=%s", string(out), err.Error())
return false, nil
}
val = strings.TrimSpace(string(out))
Expand Down