diff options
| -rw-r--r-- | .github/workflows/deploy.yml | 6 | ||||
| -rw-r--r-- | Dockerfile | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 012ff16..820251b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -10,7 +10,7 @@ jobs: build-job: runs-on: ubuntu-latest container: - image: ghcr.io/ccleberg/cleberg.net:github-actions + image: ghcr.io/ccleberg/cleberg.net:main steps: - name: Checkout code @@ -37,7 +37,7 @@ jobs: needs: build-job environment: production container: - image: ghcr.io/ccleberg/cleberg.net:github-actions + image: ghcr.io/ccleberg/cleberg.net:main steps: - name: Checkout code @@ -60,4 +60,4 @@ jobs: rsync -avz --delete \ -e "ssh -p 2169 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ .build/ \ - $SERVER_USER@$SERVER_IP:/var/www/cleberg.net/
\ No newline at end of file + $SERVER_USER@$SERVER_IP:/var/www/cleberg.net/ @@ -13,10 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ openssh-client \ && rm -rf /var/lib/apt/lists/* -RUN useradd -m -s /bin/bash linuxbrew && \ - echo "linuxbrew:linuxbrew" | chpasswd && \ - adduser linuxbrew sudo - +RUN useradd -m -s /bin/bash linuxbrew USER linuxbrew WORKDIR /home/linuxbrew @@ -25,9 +22,10 @@ RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/instal RUN brew install emacs rsync uv minify RUN mkdir -p ~/.config/emacs/.local/straight/repos && \ - git clone https://github.com/emacsorphanage/htmlize.git ~/.config/emacs/.local/straight/repos/htmlize && \ - git clone https://github.com/emacs-love/templatel.git ~/.config/emacs/.local/straight/repos/templatel && \ - git clone https://github.com/emacs-love/weblorg.git ~/.config/emacs/.local/straight/repos/weblorg + cd ~/.config/emacs/.local/straight/repos && \ + git clone --depth 1 https://github.com/emacsorphanage/htmlize.git && \ + git clone --depth 1 https://github.com/emacs-love/templatel.git && \ + git clone --depth 1 https://github.com/emacs-love/weblorg.git USER root WORKDIR /builds |