Merge pull request #603 from Automattic/update/mu

refactor(mu-plugins): use staged build and improve rebuild speed
Automattic · Dec 8, 2023 · df05db9 · df05db9
2 parents 08a60bb + 438a8cc
commit df05db9
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/mu-plugins/Dockerfile b/mu-plugins/Dockerfile
@@ -1,21 +1,19 @@
-FROM ghcr.io/automattic/vip-container-images/alpine:3.19.0@sha256:43e68e32a67c813ffa4ee5a9355a353d42a24e307474978b765b91ab942b4758
+FROM ghcr.io/automattic/vip-container-images/alpine:3.19.0@sha256:43e68e32a67c813ffa4ee5a9355a353d42a24e307474978b765b91ab942b4758 AS build
+
+RUN apk add --no-cache git && mkdir -p /mu-plugins
+RUN git clone --depth 1 https://github.com/Automattic/vip-go-mu-plugins-ext /mu-plugins-ext
+RUN git clone --depth 1 --no-remote-submodules -b staging https://github.com/Automattic/vip-go-mu-plugins /mu-plugins-tmp
+WORKDIR /mu-plugins-tmp
+RUN sed -i -e "s,git@github.com:,https://github.com/," .gitmodules && git submodule update --init --recursive --depth 1 --single-branch --jobs 8
+RUN gitsha=$(git rev-parse --short HEAD) && gitdate=$(git show -s --format=%cs "$gitsha") && date=$(date -d "$gitdate" '+%Y%m%d') && echo "{ \"tag\": \"staging\", \"stack_version\": \"${date}-${gitsha}\" }" > "/mu-plugins/.version"
+RUN rsync -a -r --delete --exclude-from="/mu-plugins-tmp/.dockerignore" /mu-plugins-tmp/* /mu-plugins
+RUN rsync -a -r --delete --exclude-from="/mu-plugins-ext/.dockerignore" /mu-plugins-ext/* /mu-plugins
 
-RUN \
-    apk add --no-cache git && \
-    mkdir -p /mu-plugins && \
-    git clone --depth 1 --no-remote-submodules -b staging https://github.com/Automattic/vip-go-mu-plugins /mu-plugins-tmp && \
-    # cp /mu-plugins/.dockerignore /.dockerignore && \
-    git clone --depth 1 https://github.com/Automattic/vip-go-mu-plugins-ext /mu-plugins-ext && \
-    cd /mu-plugins-tmp && \
-    sed -i -e "s,git@github.com:,https://github.com/," .gitmodules && \
-    git submodule update --init --recursive --depth 1 && \
-    gitsha=$(git rev-parse --short HEAD) && gitdate=$(git show -s --format=%cs "$gitsha") && date=$(date -d "$gitdate" '+%Y%m%d') && echo "{ \"tag\": \"staging\", \"stack_version\": \"${date}-${gitsha}\" }" > "/mu-plugins/.version" && \
-    rsync -a -r --delete --exclude-from="/mu-plugins-tmp/.dockerignore" /mu-plugins-tmp/* /mu-plugins && \
-    rsync -a -r --delete --exclude-from="/mu-plugins-ext/.dockerignore" /mu-plugins-ext/* /mu-plugins && \
-    rm -rf /mu-plugins-tmp /mu-plugins-ext && \
-    apk del git && \
-    install -d -m 0755 /shared
 
+FROM ghcr.io/automattic/vip-container-images/alpine:3.19.0@sha256:43e68e32a67c813ffa4ee5a9355a353d42a24e307474978b765b91ab942b4758
+
+RUN install -d -m 0755 /shared
+COPY --from=build /mu-plugins /mu-plugins
 COPY run.sh /run.sh
 
 VOLUME ["/shared"]