chore: Update Dockerfile to fix Teleport installation command and create teleport configuration file
Build and Push Docker Images / build-and-push (push) Successful in 6m25s

This commit is contained in:
Bram Kelchtermans
2024-08-19 17:02:28 +02:00
parent a1a12c4f0c
commit e1e5809863
2 changed files with 23 additions and 15 deletions
-10
View File
@@ -16,19 +16,9 @@ RUN rm -rf linux-presets
RUN usermod -aG sudo root
# SHELL [ "fish", "--command" ]
# RUN chsh -s /usr/bin/fish
# ENV SHELL /usr/bin/fish
# ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8
# Create a directory for the SSH keys
RUN mkdir -p /root/.ssh
COPY install-node.sh /usr/local/bin/install-node.sh
RUN chmod +x /usr/local/bin/install-node.sh
RUN /usr/local/bin/install-node.sh
# Copy the entrypoint script into the container
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
RUN chmod +x /usr/local/bin/entrypoint.sh
+20 -2
View File
@@ -23,7 +23,25 @@ if [ -z $GIT_EMAIL ]; then
exit 1
fi
# If no teleport edition is given, fallback to oss
if [ -z "$TELEPORT_EDITION" ]; then
TELEPORT_EDITION="oss"
fi
# Install Teleport if the environment variables are set
if [ -n "$TELEPORT_VERSION" ] && [ -n "$TELEPORT_URL" ]; then
echo "Installing Teleport version $TELEPORT_VERSION, edition $TELEPORT_EDITION..."
echo "Executing: curl https://goteleport.com/static/install.sh | bash -s $TELEPORT_VERSION $TELEPORT_EDITION"
curl https://goteleport.com/static/install.sh | bash -s ${TELEPORT_VERSION} ${TELEPORT_EDITION}
## If teleport token is set and there is no teleport.yaml file, create one
if [ -n "$TELEPORT_TOKEN" ] && [ ! -f /etc/teleport.yaml ]; then
teleport configure --roles=node --token=$TELEPORT_TOKEN --proxy=$TELEPORT_URL --no-acme -o file
echo "Created teleport configuration file"
fi
else
echo "Error: TELEPORT_VERSION and TELEPORT_EDITION environment variables must be set."
fi
# Ensure the SSH key has the correct permissions
chmod 600 /root/.ssh/id_rsa
@@ -38,14 +56,14 @@ if [ ! -d "/workspace/.git" ]; then
HostName $DOMAIN
IdentityFile /root/.ssh/id_rsa
StrictHostKeyChecking no
" >> /root/.ssh/config
" >>/root/.ssh/config
# Clone the repository if it doesn't exist
git clone $REPO_URL /workspace
fi
# Add the public SSH key to authorized_keys
if [ -f /root/.ssh/hostkey.pub ]; then
cat /root/.ssh/hostkey.pub >> /root/.ssh/authorized_keys
cat /root/.ssh/hostkey.pub >>/root/.ssh/authorized_keys
fi
# Change to the repository directory