From 5b15cdda6f1212f1b2f6b1db3a117b4620427bd1 Mon Sep 17 00:00:00 2001 From: tavo Date: Mon, 11 Nov 2024 20:42:20 -0600 Subject: [PATCH] arch --- dev/Dockerfile | 15 +++++++-------- dev/build.sh | 2 +- dev/deploy.sh | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dev/Dockerfile b/dev/Dockerfile index c6d226a..a3a1577 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -1,23 +1,22 @@ -FROM debian:latest +FROM archlinux:latest -RUN apt-get update && \ - apt-get install -y sudo exa curl ffmpeg imagemagick groff openssh-server build-essential git neovim emacs python3 python-is-python3 python3-venv python3-pip golang clang clang-format nodejs npm php-fpm r-recommended texlive-base texlive-fonts-recommended && \ +RUN pacman -Syu --noconfirm && \ + pacman -S --noconfirm sudo exa curl ffmpeg imagemagick groff openssh base-devel git neovim emacs python python-pip python-virtualenv go go-tools clang nodejs npm php texlive-core texlive-fontsextra r && \ mkdir /var/run/sshd -RUN useradd -ms /bin/bash dev -RUN echo "dev ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers +RUN useradd -ms /bin/bash dev && \ + echo "dev ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers ARG SSH_KEY - RUN mkdir -p /home/dev/.ssh && \ echo "$SSH_KEY" >> /home/dev/.ssh/authorized_keys && \ chown -R dev:dev /home/dev/.ssh && \ chmod 600 /home/dev/.ssh/authorized_keys RUN git clone https://git.tavo.one/tavo/dotfiles /home/dev/.config && \ - echo ". ~/.config/shell/env-min" >> /home/dev/.bash_profile && \ + echo ". ~/.config/shell/env-min" >> /home/dev/.profile && \ echo ". ~/.config/shell/env-min" >> /home/dev/.bashrc && \ - echo ". ~/.config/shell/bashrc" >> /home/dev/.bash_profile && \ + echo ". ~/.config/shell/bashrc" >> /home/dev/.profile && \ echo ". ~/.config/shell/bashrc" >> /home/dev/.bashrc && \ chown -R dev:dev /home/dev diff --git a/dev/build.sh b/dev/build.sh index 2607738..3c923f9 100755 --- a/dev/build.sh +++ b/dev/build.sh @@ -4,4 +4,4 @@ SSH_KEY_ARG="$1" [ -z "$SSH_KEY_ARG" ] && echo "No ssh-key provided" && exit 1 podman rm -f dev -podman build --build-arg SSH_KEY="$SSH_KEY_ARG" -t debian-dev-env . +podman build --build-arg SSH_KEY="$SSH_KEY_ARG" -t arch-dev-env . diff --git a/dev/deploy.sh b/dev/deploy.sh index 50213a1..eca531e 100755 --- a/dev/deploy.sh +++ b/dev/deploy.sh @@ -1,3 +1,3 @@ #!/bin/sh -podman run -d --restart=always --name dev -p 2222:22 debian-dev-env +podman run -d --restart=always --name dev -p 2222:22 --replace arch-dev-env