update alpine and docker compose versions (#10)

earthly · Jan 23, 2023 · 635a7da · 635a7da
1 parent f39d559
commit 635a7da
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Earthfile b/Earthfile
@@ -6,7 +6,7 @@ INSTALL_DIND:
     RUN /tmp/install-dind.sh
 
 install-dind-script:
-    FROM alpine:3.13
+    FROM alpine:3.17
     COPY ./install-dind.sh ./
     SAVE ARTIFACT ./install-dind.sh
 
@@ -36,6 +36,13 @@ test-install-dind-arm64:
 test-install-dind-for-image:
     ARG base_image
     FROM "$base_image"
+
+    # docker-compose will fail with:
+    #     Error response from daemon: Invalid container name (-hello-1), only [a-zA-Z0-9][a-zA-Z0-9_.-] are allowed
+    # if docker-compose.yml is in the root directory, due to the --project flag defaulting to "".
+    # This bug does not exist in the official earthly/dind:alpine image.
+    WORKDIR /dind-test
+
     DO +INSTALL_DIND
     RUN echo "
 version: \"3\"

diff --git a/install-dind.sh b/install-dind.sh
@@ -45,13 +45,13 @@ install_docker_compose() {
             echo "Detected architecture is $(uname -m)"
             case "$(uname -m)" in
                 armv7l|armhf)
-                    curl -L "https://github.com/linuxserver/docker-docker-compose/releases/download/1.27.4-ls27/docker-compose-armhf" -o /usr/local/bin/docker-compose
+                    curl -L "https://github.com/linuxserver/docker-docker-compose/releases/download/1.29.2-ls53/docker-compose-armhf" -o /usr/local/bin/docker-compose
                     ;;
                 arm64|aarch64)
-                    curl -L "https://github.com/linuxserver/docker-docker-compose/releases/download/1.27.4-ls27/docker-compose-arm64" -o /usr/local/bin/docker-compose
+                    curl -L "https://github.com/linuxserver/docker-docker-compose/releases/download/1.29.2-ls53/docker-compose-arm64" -o /usr/local/bin/docker-compose
                     ;;
                 *)
-                    curl -L "https://github.com/docker/compose/releases/download/1.27.4/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+                    curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
                     ;;
             esac
             chmod +x /usr/local/bin/docker-compose