From 24105c4ab5c739f71e6fcb92ddf21bd03f341b0a Mon Sep 17 00:00:00 2001 From: adrien Date: Sun, 29 Jun 2025 17:54:35 +0000 Subject: [PATCH] Update arch machine --- Dockerfile.arch-ttyd | 21 ++++++++++++--------- vms.yml | 12 +++++++----- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Dockerfile.arch-ttyd b/Dockerfile.arch-ttyd index 67314f2..efa2766 100644 --- a/Dockerfile.arch-ttyd +++ b/Dockerfile.arch-ttyd @@ -9,7 +9,6 @@ RUN pacman -Syu --noconfirm && \ vim \ nvim \ nano \ - htop \ lazygit \ ttyd \ sudo \ @@ -17,24 +16,28 @@ RUN pacman -Syu --noconfirm && \ net-tools \ iputils \ bind-tools \ + unzip \ + yazi \ + go \ + zig \ + ripgrep \ openssh && \ pacman -Scc --noconfirm # Create a workspace directory RUN mkdir -p /data -# Create entrypoint script -RUN echo '#!/bin/bash' > /entrypoint.sh && \ - echo 'chmod 600 /root/.ssh/id_rsa' >> /entrypoint.sh && \ - echo 'exec ttyd -c $TTYD_USERNAME:$TTYD_PASSWORD -W -p 7681 bash' >> /entrypoint.sh && \ - chmod +x /entrypoint.sh - # Install Astronvim RUN git clone --depth 1 https://github.com/AstroNvim/template ~/.config/nvim && \ rm -rf ~/.config/nvim/.git +# Setup Git +RUN git config --global user.email "git@bouvais.lu" +RUN git config --global user.name "adrien" + +# Add Gopls +RUN go install golang.org/x/tools/gopls@latest + WORKDIR /data EXPOSE 7681 - -ENTRYPOINT ["/entrypoint.sh"] diff --git a/vms.yml b/vms.yml index 462cddc..3287853 100644 --- a/vms.yml +++ b/vms.yml @@ -1,6 +1,6 @@ services: arch-ttyd: - build: + build: context: . dockerfile: Dockerfile.arch-ttyd container_name: arch-ttyd @@ -8,10 +8,12 @@ services: volumes: - ./hdd0/vms/arch/data:/data - ./hdd0/vms/arch/root:/root - - ~/.ssh/id_rsa:/root/.ssh/id_rsa:ro - environment: - - TTYD_USERNAME=${TTYD_USERNAME:-admin} - - TTYD_PASSWORD=${MASTER_PASSWORD:-changeme} + command: > + ttyd + -p 7681 + -c "${TTYD_USERNAME}:${MASTER_PASSWORD}" + -W + bash labels: - "traefik.enable=true" - "traefik.http.routers.arch.rule=Host(`arch.bouvais.lu`)"