Skip to content

Commit f6edd3d

Browse files
Origin image was creating a file at /usr/local/bin with imagebuilder
Made more specific, filed a bug in imagebuilder.
1 parent 591b34d commit f6edd3d

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

images/origin/Dockerfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#
1111
FROM openshift/origin-base
1212

13+
COPY system-container/system-container-wrapper.sh /usr/local/bin/
14+
COPY system-container/config.json.template system-container/manifest.json system-container/service.template /exports/
1315
COPY bin/openshift /usr/bin/openshift
1416
RUN ln -s /usr/bin/openshift /usr/bin/oc && \
1517
ln -s /usr/bin/openshift /usr/bin/oadm && \
@@ -31,8 +33,4 @@ ENV HOME=/root \
3133
WORKDIR /var/lib/origin
3234
EXPOSE 8443 53
3335

34-
# files required to run as a system container
35-
COPY system-container/system-container-wrapper.sh /usr/local/bin
36-
COPY system-container/config.json.template system-container/manifest.json system-container/service.template /exports/
37-
3836
ENTRYPOINT ["/usr/bin/openshift"]

0 commit comments

Comments
 (0)