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
Build and Push Docker Images / build-and-push (push) Successful in 6m25s
This commit is contained in:
@@ -8,7 +8,7 @@ WORKDIR /workspace
|
|||||||
RUN npm install -g pm2
|
RUN npm install -g pm2
|
||||||
|
|
||||||
# Install git, openssh-client, and openssh-server
|
# Install git, openssh-client, and openssh-server
|
||||||
RUN apt-get update && apt-get install -y git openssh-client software-properties-common sudo
|
RUN apt-get update && apt-get install -y git openssh-client software-properties-common sudo
|
||||||
# RUN apt-get install -y fish
|
# RUN apt-get install -y fish
|
||||||
|
|
||||||
RUN git clone https://gitea.bramkelchtermans.be/Bram/linux-presets.git && cd linux-presets && chmod +x setup.sh && ./setup.sh --terminal-icon
|
RUN git clone https://gitea.bramkelchtermans.be/Bram/linux-presets.git && cd linux-presets && chmod +x setup.sh && ./setup.sh --terminal-icon
|
||||||
@@ -16,19 +16,9 @@ RUN rm -rf linux-presets
|
|||||||
|
|
||||||
RUN usermod -aG sudo root
|
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
|
# Create a directory for the SSH keys
|
||||||
RUN mkdir -p /root/.ssh
|
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 the entrypoint script into the container
|
||||||
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
COPY entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||||
RUN chmod +x /usr/local/bin/entrypoint.sh
|
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||||
|
|||||||
@@ -13,17 +13,35 @@ if [ ! -f /root/.ssh/id_rsa ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z $GIT_USER ]; then
|
if [ -z $GIT_USER ]; then
|
||||||
echo "Error: GIT_USER environment variable must be set."
|
echo "Error: GIT_USER environment variable must be set."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z $GIT_EMAIL ]; then
|
if [ -z $GIT_EMAIL ]; then
|
||||||
echo "Error: GIT_EMAIL environment variable must be set."
|
echo "Error: GIT_EMAIL environment variable must be set."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
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
|
# Ensure the SSH key has the correct permissions
|
||||||
chmod 600 /root/.ssh/id_rsa
|
chmod 600 /root/.ssh/id_rsa
|
||||||
@@ -38,14 +56,14 @@ if [ ! -d "/workspace/.git" ]; then
|
|||||||
HostName $DOMAIN
|
HostName $DOMAIN
|
||||||
IdentityFile /root/.ssh/id_rsa
|
IdentityFile /root/.ssh/id_rsa
|
||||||
StrictHostKeyChecking no
|
StrictHostKeyChecking no
|
||||||
" >> /root/.ssh/config
|
" >>/root/.ssh/config
|
||||||
# Clone the repository if it doesn't exist
|
# Clone the repository if it doesn't exist
|
||||||
git clone $REPO_URL /workspace
|
git clone $REPO_URL /workspace
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add the public SSH key to authorized_keys
|
# Add the public SSH key to authorized_keys
|
||||||
if [ -f /root/.ssh/hostkey.pub ]; then
|
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
|
fi
|
||||||
|
|
||||||
# Change to the repository directory
|
# Change to the repository directory
|
||||||
|
|||||||
Reference in New Issue
Block a user