Skip to content

Enable multi architecture compatibility between Tentacle and Script pods #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Enable multi architecture compatibility between Tentacle and Script pods #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8460a61
Enable multi architecture compatibility between Tentacle and Script pods
octonautcal Sep 11, 2025
9b102e6
Merge branch 'main' into calluy/sc-100205/enable-multi-architecture-c…
octonautcal Sep 12, 2025
f228955
Hard code path
octonautcal Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions docker/kubernetes-agent-tentacle/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,19 @@ ARG TARGETOS
COPY docker/kubernetes-agent-tentacle/bootstrapRunner/* /bootstrapRunner/
WORKDIR /bootstrapRunner

# Create bin directory for multiple architectures
RUN mkdir -p bin

# Build for multiple architectures
# Note: the given ldflags remove debug symbols
RUN go build -ldflags "-s -w" -o "bin/bootstrapRunner"
RUN GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o "bin/bootstrapRunner-linux-amd64" \
&& GOOS=linux GOARCH=arm64 go build -ldflags "-s -w" -o "bin/bootstrapRunner-linux-arm64" \
&& GOOS=linux GOARCH=386 go build -ldflags "-s -w" -o "bin/bootstrapRunner-linux-386" \
&& GOOS=linux GOARCH=arm go build -ldflags "-s -w" -o "bin/bootstrapRunner-linux-arm"

# Copy the architecture detection script from source and make it executable
COPY docker/kubernetes-agent-tentacle/bootstrapRunner/select-bootstrapRunner.sh bin/
RUN chmod +x bin/select-bootstrapRunner.sh


FROM mcr.microsoft.com/dotnet/runtime-deps:$RuntimeDepsTag
Expand All @@ -24,8 +35,8 @@ ARG TARGETVARIANT
EXPOSE 10933

COPY docker/kubernetes-agent-tentacle/scripts/* /scripts/
COPY --from=bootstrapRunnerBuilder bootstrapRunner/bin/bootstrapRunner /bootstrapRunner
RUN chmod +x /scripts/*.sh
COPY --from=bootstrapRunnerBuilder bootstrapRunner/bin/* /bootstrapRunner/
RUN chmod +x /scripts/*.sh && chmod +x /bootstrapRunner/*

WORKDIR /tmp

Expand Down Expand Up @@ -60,7 +71,7 @@ RUN chgrp -R 0 /opt /usr /.dotnet && \
RUN chgrp 0 /etc /etc/ssl/certs && \
chmod g=u /etc /etc/ssl/certs

ENV BOOTSTRAPRUNNEREXECUTABLEPATH=/bootstrapRunner
ENV BOOTSTRAPRUNNEREXECUTABLEPATH=/bootstrapRunner/select-bootstrapRunner.sh
ENV OCTOPUS_RUNNING_IN_CONTAINER=Y
ENV ACCEPT_EULA=N
ENV CustomPublicHostName=""
Expand Down
50 changes: 50 additions & 0 deletions docker/kubernetes-agent-tentacle/bootstrapRunner/select-bootstrapRunner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#!/bin/bash
set -eu

# Architecture detection and bootstrap runner selection script
# This script automatically detects the runtime architecture and selects
# the appropriate bootstrapRunner binary for execution.

# Detect the current architecture
ARCH=$(uname -m)
OS=$(uname -s | tr '[:upper:]' '[:lower:]')

# Map architecture names to Go architecture naming
case "$ARCH" in
x86_64)
GO_ARCH="amd64"
;;
aarch64|arm64)
GO_ARCH="arm64"
;;
i386|i686)
GO_ARCH="386"
;;
armv7l|armv6l)
GO_ARCH="arm"
;;
*)
echo "Error: Unsupported architecture: $ARCH" >&2
echo "Supported architectures: x86_64, aarch64, arm64, i386, i686, armv7l, armv6l" >&2
exit 1
;;
esac

# Construct binary name
BINARY_NAME="bootstrapRunner-${OS}-${GO_ARCH}"
BINARY_PATH="/bootstrapRunner/$BINARY_NAME"

# Check if the binary exists
if [ ! -f "$BINARY_PATH" ]; then
echo "Error: Bootstrap runner binary not found for architecture ${OS}-${GO_ARCH}" >&2
echo "Looking for: $BINARY_PATH" >&2
echo "Available binaries:" >&2
ls -1 "/bootstrapRunner"/bootstrapRunner-* 2>/dev/null || echo " No bootstrap binaries found" >&2
exit 1
fi

# Make sure the binary is executable
chmod +x "$BINARY_PATH"

# Execute the appropriate binary with all arguments passed through
exec "$BINARY_PATH" "$@"