mirror of
https://github.com/openshift/installer.git
synced 2026-02-05 15:47:14 +01:00
Merge pull request #9491 from joepvd/path-munging
OCPBUGS-50920: Rely on path declaration of base image
This commit is contained in:
@@ -33,7 +33,6 @@ RUN dnf install -y nmstate openshift-clients && \
|
||||
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
USER 1000:1000
|
||||
ENV PATH /bin
|
||||
ENV HOME /output
|
||||
WORKDIR /output
|
||||
ENTRYPOINT ["/bin/openshift-install"]
|
||||
|
||||
@@ -31,7 +31,6 @@ COPY --from=builder /go/src/github.com/openshift/installer/bin/openshift-install
|
||||
COPY --from=builder /go/src/github.com/openshift/installer/bin/manifests/ /manifests/
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
USER 1000:1000
|
||||
ENV PATH /bin
|
||||
ENV HOME /output
|
||||
WORKDIR /output
|
||||
# We're not really an operator, we're just getting some data into the release image.
|
||||
|
||||
@@ -28,7 +28,6 @@ COPY --from=builder /go/src/github.com/openshift/installer/bin/manifests/ /manif
|
||||
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
USER 1000:1000
|
||||
ENV PATH /bin
|
||||
ENV HOME /output
|
||||
WORKDIR /output
|
||||
# We're not really an operator, we're just getting some data into the release image.
|
||||
|
||||
@@ -114,6 +114,5 @@ RUN mkdir /output/.ssh && chown 1000:1000 "/output/.ssh/" && chmod -R g=u "/outp
|
||||
|
||||
RUN chown 1000:1000 /output && chmod -R g=u "/output/.bluemix/"
|
||||
USER 1000:1000
|
||||
ENV PATH /bin
|
||||
ENV HOME /output
|
||||
WORKDIR /output
|
||||
|
||||
@@ -47,6 +47,5 @@ RUN ln -s /bin/yq-go /bin/yq && chmod +x /bin/yq
|
||||
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
USER 1000:1000
|
||||
ENV PATH /bin
|
||||
ENV HOME /output
|
||||
WORKDIR /output
|
||||
|
||||
@@ -62,7 +62,6 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
|
||||
|
||||
RUN mkdir /output && chown 1000:1000 /output
|
||||
USER 1000:1000
|
||||
ENV PATH /bin:/usr/local/bin
|
||||
ENV HOME /output
|
||||
ENV LC_ALL en_US.UTF-8
|
||||
WORKDIR /output
|
||||
|
||||
Reference in New Issue
Block a user