chore: wip

Author: brad-jones

.devcontainer/Earthfile

@@ -1,10 +1,12 @@
 VERSION --use-cache-command 0.6
 IMPORT github.com/brad-jones/earthly-devcontainer/debian
+IMPORT github.com/brad-jones/earthly-devcontainer/debian/entrypoint
 IMPORT github.com/brad-jones/earthly-devcontainer/debian/ca-certificates
+
 FROM debian+base
+DO debian+INSTALL_HOOKS
 DO ca-certificates+INSTALL
-#DO ../utils+INSTALL_HOOKS
-#DO ../utils+INSTALL_ENTRYPOINT
-#SAVE IMAGE ghcr.io/brad-jones/earthly-devcontainer/devcontainer:latest
+DO entrypoint+INSTALL
+SAVE IMAGE ghcr.io/brad-jones/earthly-devcontainer/devcontainer:latest
 
 # https://github.com/brad-jones/hashdir/blob/master/.devcontainer/Dockerfile

debian/Earthfile

@@ -60,26 +60,3 @@ INSTALL_HOOKS:
   COPY ./hooks/. /usr/local/bin/.
   RUN for file in /usr/local/bin/*.bash; do mv "$file" "${file%%.bash}"; done
   RUN chmod +x /usr/local/bin/*
-
-# Create our entrypoint that will execute each time the devcontainer is started.
-#
-# This is designed to work with: "overrideCommand": false
-# If this property in the devcontainer.json config is set to true (the default)
-# then the entrypoint will not be executed.
-#
-# NOTE: The entrypoint will execute with root permissions so it can do things
-# like setup permissions to the mounted docker socket & then it will use gosu
-# to switch to the unprivilaged user.
-#
-# see: https://code.visualstudio.com/docs/remote/containers-advanced#_adding-startup-commands-to-the-docker-image-instead
-#INSTALL_ENTRYPOINT:
-#  COMMAND
-#  ARG USERNAME="code"
-#  ARG USER_UID="1000"
-#  ARG USER_GID="${USER_UID}"
-#  ARG DOCKER_SOURCE_SOCKET="/var/run/docker-host.sock"
-#  ARG DOCKER_TARGET_SOCKET="/var/run/docker.sock"
-#  ARG ENTRYPOINT_LOGS="/tmp/entrypoint-logs"
-#  RUN install-entrypoint
-#  ENTRYPOINT [ "/entrypoint.bash" ]
-#  CMD [ "sleep", "infinity" ]

debian/entrypoint/Earthfile

@@ -0,0 +1,35 @@
+VERSION --use-cache-command 0.6
+IMPORT github.com/brad-jones/earthly-devcontainer/debian
+IMPORT github.com/brad-jones/earthly-devcontainer/debian/entrypoint
+
+# Create our entrypoint that will execute each time the devcontainer is started.
+#
+# This is designed to work with: "overrideCommand": false
+# If this property in the devcontainer.json config is set to true (the default)
+# then the entrypoint will not be executed.
+#
+# NOTE: The entrypoint will execute with root permissions so it can do things
+# like setup permissions to the mounted docker socket & then it will use gosu
+# to switch to the unprivilaged user.
+#
+# see: https://code.visualstudio.com/docs/remote/containers-advanced#_adding-startup-commands-to-the-docker-image-instead
+
+build:
+  FROM debian+builder
+  ARG USERNAME="code"
+  ARG USER_UID="1000"
+  ARG USER_GID="${USER_UID}"
+  ARG DOCKER_SOURCE_SOCKET="/var/run/docker-host.sock"
+  ARG DOCKER_TARGET_SOCKET="/var/run/docker.sock"
+  ARG ENTRYPOINT_LOGS="/tmp/entrypoint-logs"
+  COPY ./install-entrypoint.bash /usr/local/bin/install-entrypoint
+  RUN chmod +x /usr/local/bin/install-entrypoint && install-entrypoint
+  SAVE ARTIFACT /entrypoint.bash
+
+INSTALL:
+  COMMAND
+  IF [ ! -f "/entrypoint.bash" ]
+    COPY entrypoint+build/ /
+    ENTRYPOINT [ "/entrypoint.bash" ]
+    CMD [ "sleep", "infinity" ]
+  END