comparing a2b5a858e6935d6c4ad146b22062d07fb288a9ef and main on bladee.bsky.social/knot-container

+3

.containerignore

···

       1
       1
       +
       /.gitignore

     

       2
       2
       +
       /Containerfile

     

       3
       3
       +
       /keys/

+1

.gitignore

···

       1
       1
       +
       /keys/

+1 -1

10-tangled.conf

···

       1
       1
        
       Match User git

     

       2
       2
       -
           AuthorizedKeysCommand /usr/libexec/keyfetch -repoguard-path /usr/libexec/repoguard

     

       2
       2
       +
           AuthorizedKeysCommand /usr/libexec/knot keys -o authorized-keys

     

       3
       3
        
           AuthorizedKeysCommandUser nobody

+4 -7

Containerfile

···

       1
       1
       -
       FROM registry.fedoraproject.org/fedora:41 AS build

     

       1
       1
       +
       FROM registry.fedoraproject.org/fedora:42 AS build

     

       2
       2
        
       

     

       3
       3
        
       RUN dnf install --assumeyes git go && \

     

       4
       4
        
           git clone https://tangled.sh/@tangled.sh/core

     

       5
       5
        
       

     

       6
       6
        
       WORKDIR /core

     

       7
       7
        
       ENV CGO_ENABLED=1

     

       8
       8
       -
       RUN go build -o knot ./cmd/knotserver && \

     

       9
       9
       -
           go build -o keyfetch ./cmd/keyfetch && \

     

       10
       10
       -
           go build -o repoguard ./cmd/repoguard

     

       8
       8
       +
       RUN git checkout v1.9.0-alpha && \

     

       9
       9
       +
           go build -o knot ./cmd/knot

     

       11
       10
        
       

     

       12
       12
       -
       FROM registry.fedoraproject.org/fedora:41 AS run

     

       11
       11
       +
       FROM registry.fedoraproject.org/fedora:42 AS run

     

       13
       12
        
       

     

       14
       13
        
       RUN dnf install --assumeyes git openssh-server && \

     

       15
       14
        
           dnf clean all

     

       16
       15
        
       

     

       17
       17
       -
       COPY --from=build /core/keyfetch /usr/libexec/keyfetch

     

       18
       16
        
       COPY --from=build /core/knot /usr/libexec/knot

     

       19
       19
       -
       COPY --from=build /core/repoguard /usr/libexec/repoguard

     

       20
       17
        
       

     

       21
       18
        
       COPY ./10-tangled.conf /etc/ssh/sshd_config.d/10-tangled.conf

     

       22
       19

+1 -1

entrypoint.sh

···

       14
       14
        
       /usr/sbin/sshd -D -h /keys/ssh_host_ed25519_key &

     

       15
       15
        
       

     

       16
       16
        
       chown git:git /home/git

     

       17
       17
       -
       exec sudo -u git -E /usr/bin/sh -c "cd /home/git && /usr/libexec/knot \"$@\""

     

       17
       17
       +
       exec sudo -u git -E /usr/bin/sh -c "cd /home/git && /usr/libexec/knot server \"$@\""

+23

knot.container

···

       1
       1
       +
       [Unit]

     

       2
       2
       +
       Description=Tangled Knot server

     

       3
       3
       +
       

     

       4
       4
       +
       [Container]

     

       5
       5
       +
       Image=ghcr.io/averyrivers/knot-container:latest

     

       6
       6
       +
       AutoUpdate=registry

     

       7
       7
       +
       Environment=APPVIEW_ENDPOINT=https://tangled.sh

     

       8
       8
       +
       Environment=KNOT_REPO_SCAN_PATH=/home/git

     

       9
       9
       +
       Environment=KNOT_SERVER_HOSTNAME=

     

       10
       10
       +
       Environment=KNOT_SERVER_OWNER=

     

       11
       11
       +
       Environment=KNOT_SERVER_INTERNAL_LISTEN_ADDR=0.0.0.0:5444

     

       12
       12
       +
       Environment=KNOT_SERVER_LISTEN_ADDR=0.0.0.0:5555

     

       13
       13
       +
       PublishPort=0.0.0.0:10222:22/tcp

     

       14
       14
       +
       PublishPort=127.0.0.1:10743:5555/tcp

     

       15
       15
       +
       Volume=%S/%N/keys:/keys:rw,Z

     

       16
       16
       +
       Volume=%S/%N/git:/home/git:rw,Z

     

       17
       17
       +
       

     

       18
       18
       +
       [Service]

     

       19
       19
       +
       Restart=always

     

       20
       20
       +
       ExecStartPre=mkdir -p "%S/%N/keys" "%S/%N/git"

     

       21
       21
       +
       

     

       22
       22
       +
       [Install]

     

       23
       23
       +
       WantedBy=multi-user.target

Compare changes