Move symlink generation into dockerfile (#843)

OctopusDeploy · Mar 19, 2024 · 8022083 · 8022083
1 parent ff24b30
commit 8022083
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile
@@ -32,8 +32,9 @@ COPY _artifacts/deb/tentacle_${BUILD_NUMBER}_amd64.deb /tmp/
 RUN apt-get update && \
     apt install ./tentacle_${BUILD_NUMBER}_amd64.deb && \
     apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
+    rm -rf /var/lib/apt/lists/* && \
+    ln -s /opt/octopus/tentacle/Tentacle /usr/bin/tentacle
+
 WORKDIR /
 
 # We know this won't reduce the image size at all. It's just to make the filesystem a little tidier.

diff --git a/docker/linux/scripts/configure-tentacle.sh b/docker/linux/scripts/configure-tentacle.sh
@@ -16,10 +16,6 @@ internalListeningPort=10933
 mkdir -p $configurationDirectory
 mkdir -p $applicationsDirectory
 
-if [ ! -f /usr/bin/tentacle ]; then
-    ln -s /opt/octopus/tentacle/Tentacle /usr/bin/tentacle
-fi
-
 if [ -f "$alreadyConfiguredSemaphore" ]; then
     echo "Octopus Tentacle is already configured. Skipping reconfiguration."
     echo "If you want to force reconfiguration, please delete the file $alreadyConfiguredSemaphore and re-launch the container."