Skip to content

Commit

Permalink
[hotfix] httpd build failure
Browse files Browse the repository at this point in the history
As it turns out, multi-stage Docker builds is kind of [an accidental feature](openshift/origin#21627) of OpenShift 3.10+, and as such, it comes with its pitfalls.

- As the second FROM doesn't get rewritten, we must use an “OpenShift-realistic” name for the image if it is to succeed on OpenShift
- While we are at it, do same for mgmt (and we'll have to fix wp-dev accordingly, as it relies on the very same set of Dockerfiles)
  • Loading branch information
Dominique Quatravaux committed Oct 8, 2021
1 parent 607a58a commit 09df19f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docker/httpd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM epflsi/os-wp-base
FROM docker-registry.default.svc:5000/wwp-test/wp-base

RUN perl -i -pe 's/^# deb-src/deb-src/' /etc/apt/sources.list /etc/apt/sources.list.d/*.list

Expand All @@ -15,7 +15,7 @@ RUN set -e -x; mkdir /build; cd /build; \
cd msmtp*; dpkg-buildpackage -d; \
mkdir /deb; mv ../*.deb /deb

FROM epflsi/os-wp-base
FROM docker-registry.default.svc:5000/wwp-test/wp-base

RUN apt-get -qy update && apt-get -qy install --no-install-recommends \
apache2 \
Expand Down
2 changes: 1 addition & 1 deletion docker/mgmt/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM epflsi/os-wp-base
FROM docker-registry.default.svc:5000/wwp-test/mgmt

RUN apt-get -qy update && apt-get -qy install --no-install-recommends \
bash-completion \
Expand Down

0 comments on commit 09df19f

Please sign in to comment.