From 53cb9b24f4bb62d79d4cfb0f66a539964227adc9 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Thu, 5 Dec 2024 06:49:20 +0200 Subject: [PATCH 1/2] refactor(dev-tools): always update `/devtools` --- dev-tools/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile index 9c83d464..1381e501 100644 --- a/dev-tools/Dockerfile +++ b/dev-tools/Dockerfile @@ -1,6 +1,7 @@ FROM ghcr.io/automattic/vip-container-images/alpine:3.21.0@sha256:32cff7c1b6fe35a9f3d0c829a5a29ca80761a19ae63c15c914bf4c03fbf7df66 +COPY setup.sh add-site.sh dev-env-plugin.php wp-config* /dev-tools-orig/ COPY setup.sh add-site.sh dev-env-plugin.php wp-config* /dev-tools/ COPY scripts /scripts -CMD ["sleep", "infinity"] +ENTRYPOINT ["/usr/bin/rsync", "-a", "--delete", "/dev-tools-orig/", "/dev-tools/"] From e357c268c25f272b9104d8d905af744ce159f4e0 Mon Sep 17 00:00:00 2001 From: Volodymyr Kolesnykov Date: Sun, 8 Dec 2024 16:37:03 +0200 Subject: [PATCH 2/2] refactor: switch to `busybox` --- dev-tools/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dev-tools/Dockerfile b/dev-tools/Dockerfile index 1381e501..2ff229db 100644 --- a/dev-tools/Dockerfile +++ b/dev-tools/Dockerfile @@ -1,7 +1,9 @@ -FROM ghcr.io/automattic/vip-container-images/alpine:3.21.0@sha256:32cff7c1b6fe35a9f3d0c829a5a29ca80761a19ae63c15c914bf4c03fbf7df66 +FROM ghcr.io/automattic/vip-container-images/helpers:v1@sha256:9f77c3da2ca0394d5846a9fc4195041f59ff5821ea6a7aaa43a08f15d28bf1eb AS helpers +FROM busybox:stable-musl@sha256:0fc05e424940109068f4d6562b699da2563cd8521a35d7b216a5b0c51fb29281 -COPY setup.sh add-site.sh dev-env-plugin.php wp-config* /dev-tools-orig/ -COPY setup.sh add-site.sh dev-env-plugin.php wp-config* /dev-tools/ -COPY scripts /scripts +COPY --from=helpers /rsync /usr/bin/rsync +COPY --link setup.sh add-site.sh dev-env-plugin.php wp-config* /dev-tools-orig/ +COPY --link setup.sh add-site.sh dev-env-plugin.php wp-config* /dev-tools/ +COPY --link scripts /scripts ENTRYPOINT ["/usr/bin/rsync", "-a", "--delete", "/dev-tools-orig/", "/dev-tools/"]