From 478b70f177b89bf249d1dfcef034caa9c265e1c8 Mon Sep 17 00:00:00 2001 From: Justin Walsh <49404281+Justin-Walsh@users.noreply.github.com> Date: Mon, 18 Mar 2024 09:19:53 -0400 Subject: [PATCH] Move symlink generation into dockerfile --- docker/linux/Dockerfile | 5 +++-- docker/linux/scripts/configure-tentacle.sh | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index 89394c77d..773366806 100644 --- 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 index e4bd0613d..7e7494bd7 100644 --- 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."