Commit 69fa4506b1

69fa4506b10f75205779bc6dd1e689ee943c83a2

parent: 258f58a9b3

Unregistered key

cmc <hello@cleberg.net> · 2026-02-12 07:10 UTC
committer: <noreply@github.com>

clean up Dockerfile (#3)

* clean up Dockerfile

* fix pkg tags

Layout: unified · split

.github/workflows/deploy.yml +3 −3
@@ -10,7 +10,7 @@ jobs:
10 build-job: 10 build-job:
11 runs-on: ubuntu-latest 11 runs-on: ubuntu-latest
12 container: 12 container:
13 image: ghcr.io/ccleberg/cleberg.net:github-actions 13 image: ghcr.io/ccleberg/cleberg.net:main
14 14
15 steps: 15 steps:
16 - name: Checkout code 16 - name: Checkout code
@@ -37,7 +37,7 @@ jobs:
37 needs: build-job 37 needs: build-job
38 environment: production 38 environment: production
39 container: 39 container:
40 image: ghcr.io/ccleberg/cleberg.net:github-actions 40 image: ghcr.io/ccleberg/cleberg.net:main
41 41
42 steps: 42 steps:
43 - name: Checkout code 43 - name: Checkout code
@@ -60,4 +60,4 @@ jobs:
60 rsync -avz --delete \ 60 rsync -avz --delete \
61 -e "ssh -p 2169 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \ 61 -e "ssh -p 2169 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" \
62 .build/ \ 62 .build/ \
63 $SERVER_USER@$SERVER_IP:/var/www/cleberg.net/\ No newline at end of file 63 $SERVER_USER@$SERVER_IP:/var/www/cleberg.net/
Dockerfile +5 −7
@@ -13,10 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
13 openssh-client \ 13 openssh-client \
14 && rm -rf /var/lib/apt/lists/* 14 && rm -rf /var/lib/apt/lists/*
15 15
16RUN useradd -m -s /bin/bash linuxbrew && \ 16RUN useradd -m -s /bin/bash linuxbrew
17 echo "linuxbrew:linuxbrew" | chpasswd && \
18 adduser linuxbrew sudo
19
20USER linuxbrew 17USER linuxbrew
21WORKDIR /home/linuxbrew 18WORKDIR /home/linuxbrew
22 19
@@ -25,9 +22,10 @@ RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/instal
25RUN brew install emacs rsync uv minify 22RUN brew install emacs rsync uv minify
26 23
27RUN mkdir -p ~/.config/emacs/.local/straight/repos && \ 24RUN mkdir -p ~/.config/emacs/.local/straight/repos && \
28 git clone https://github.com/emacsorphanage/htmlize.git ~/.config/emacs/.local/straight/repos/htmlize && \ 25 cd ~/.config/emacs/.local/straight/repos && \
29 git clone https://github.com/emacs-love/templatel.git ~/.config/emacs/.local/straight/repos/templatel && \ 26 git clone --depth 1 https://github.com/emacsorphanage/htmlize.git && \
30 git clone https://github.com/emacs-love/weblorg.git ~/.config/emacs/.local/straight/repos/weblorg 27 git clone --depth 1 https://github.com/emacs-love/templatel.git && \
28 git clone --depth 1 https://github.com/emacs-love/weblorg.git
31 29
32USER root 30USER root
33WORKDIR /builds 31WORKDIR /builds