From 2344fc6086a58842d46e1397ae3d3e9a3c16bfff Mon Sep 17 00:00:00 2001 From: Florent Benoit Date: Wed, 15 Apr 2020 09:21:51 +0200 Subject: [PATCH] Revert "feat(alpine): Change parent image to be alpine based as well (#444)" This reverts commit f17c7593d07968a34b31fdceca0a4cf972dea1ea. --- build/dockerfiles/Dockerfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index 7f708ec05..a42154cdc 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -11,7 +11,7 @@ # # Builder: check meta.yamls and create index.json -FROM docker.io/alpine:3.11.5 AS builder +FROM alpine:3.10 AS builder RUN apk add --no-cache py-pip jq bash wget skopeo && pip install yq jsonschema ARG LATEST_ONLY=false @@ -34,15 +34,12 @@ RUN ./list_referenced_images.sh v3 > /build/v3/external_images.txt RUN chmod -R g+rwX /build # Build registry, copying meta.yamls and index.json from builder -FROM docker.io/httpd:2.4.43-alpine AS registry -# Allow htaccess -RUN sed -i 's| AllowOverride None| AllowOverride All|' /usr/local/apache2/conf/httpd.conf && \ - mkdir -p /var/www && ln -s /usr/local/apache2/htdocs /var/www/html -COPY README.md .htaccess /usr/local/apache2/htdocs/ -COPY --from=builder /build/v3 /usr/local/apache2/htdocs/v3 +FROM registry.centos.org/centos/httpd-24-centos7 AS registry +COPY README.md .htaccess /var/www/html/ +COPY --from=builder /build/v3 /var/www/html/v3 COPY ./build/dockerfiles/entrypoint.sh /usr/bin/ ENTRYPOINT ["/usr/bin/entrypoint.sh"] -CMD ["httpd-foreground"] +CMD ["/usr/bin/run-httpd"] # Offline build: cache .theia and .vsix files in registry itself and update metas FROM builder AS offline-builder @@ -50,4 +47,4 @@ RUN ./cache_artifacts.sh v3 && chmod -R g+rwX /build # Offline registry: copy updated meta.yamls and cached extensions FROM registry AS offline-registry -COPY --from=offline-builder /build/v3 /usr/local/apache2/htdocs/v3 +COPY --from=offline-builder /build/v3 /var/www/html/v3