comparing e8010592fb2ab0d4e1e1fbf4615202783203ada2 and main on anil.recoil.org/knot-docker

+2

.env.template

···

       1
       +
       KNOT_SERVER_HOSTNAME=<your hostname>

     

       2
       +
       KNOT_SERVER_SECRET=<secret string from the tangled.sh ui>

+3 -1

Dockerfile

···

       1
        
       FROM alpine AS build

     

       2
       -
       RUN apk add --update go git

     

       3
        
       RUN git clone https://tangled.sh/@tangled.sh/core /src

     

       4
        
       WORKDIR /src

     

       5
        
       ENV CGO_ENABLED=1

     
···

       21
        
       COPY ssh_host_ed25519_key.pub /etc/ssh

     

       22
        
       RUN chmod 600 /etc/ssh/ssh_host_ed25519_key

     

       23
        
       RUN chmod 644 /etc/ssh/ssh_host_ed25519_key.pub

     

       0
        
       
     

       0
        
       
     

       24
        
       CMD ["/bin/sh", "-c", "chown -R git:git /home/git && /usr/sbin/sshd && su-exec git knotserver"]

···

       1
        
       FROM alpine AS build

     

       2
       +
       RUN apk add --update go git gcc musl-dev

     

       3
        
       RUN git clone https://tangled.sh/@tangled.sh/core /src

     

       4
        
       WORKDIR /src

     

       5
        
       ENV CGO_ENABLED=1

     
···

       21
        
       COPY ssh_host_ed25519_key.pub /etc/ssh

     

       22
        
       RUN chmod 600 /etc/ssh/ssh_host_ed25519_key

     

       23
        
       RUN chmod 644 /etc/ssh/ssh_host_ed25519_key.pub

     

       24
       +
       COPY gitconfig /home/git/.gitconfig

     

       25
       +
       RUN passwd -u git

     

       26
        
       CMD ["/bin/sh", "-c", "chown -R git:git /home/git && /usr/sbin/sshd && su-exec git knotserver"]

+12 -2

README.md

···

       1
        
       Quick instructions:

     

       2
        
       - run `gen-key.sh` to generate an ssh host key

     

       3
       -
       - set the server name in both `conf/Caddyfile` and in `knot.env.template`

     

       4
       -
       - register a knot on tangled.sh and put the secret key in `knot.env.template`

     

       0
        
       
     

       5
        
       - spin up the container and test that it works

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6
        
       

     

       7
        
       Buyer beware, this is a very new and untested setup for alpha software,

     

       8
        
       so don't commit any overly precious code to this.

···

       1
        
       Quick instructions:

     

       2
        
       - run `gen-key.sh` to generate an ssh host key

     

       3
       +
       - copy `.env.template` to `.env`

     

       4
       +
       - set the server name  in `.env` to your fully-qualified domain name

     

       5
       +
       - register a knot on tangled.sh and put the secret key in `.env`

     

       6
        
       - spin up the container and test that it works

     

       7
       +
       

     

       8
       +
       The default service runs the ssh daemon on port 2222, so I use something

     

       9
       +
       like this in my `~/.ssh/config` to make it more seamless.

     

       10
       +
       

     

       11
       +
       ```

     

       12
       +
       Host git.recoil.org

     

       13
       +
         User git

     

       14
       +
         Port 2222

     

       15
       +
       ```

     

       16
        
       

     

       17
        
       Buyer beware, this is a very new and untested setup for alpha software,

     

       18
        
       so don't commit any overly precious code to this.

+9 -2

docker-compose.yml

···

       1
        
       services:

     

       2
        
         frontend:

     

       3
        
           image: caddy:2-alpine

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       4
        
           depends_on:

     

       5
        
             - knotserver

     

       6
        
           ports:

     
···

       9
        
             - "80:80"

     

       10
        
           volumes:

     

       11
        
             - caddy_data:/data

     

       12
       -
             - ./conf:/etc/caddy

     

       13
        
         knotserver:

     

       14
        
           environment:

     

       15
        
            - KNOT_REPO_SCAN_PATH=/home/git

     
···

       18
        
            - APPVIEW_ENDPOINT=https://tangled.sh

     

       19
        
            - KNOT_SERVER_INTERNAL_LISTEN_ADDR=0.0.0.0:5444

     

       20
        
            - KNOT_SERVER_LISTEN_ADDR=0.0.0.0:5555

     

       21
       -
           env_file: knot.env

     

       0
        
       
     

       22
        
           build:

     

       23
        
             dockerfile: Dockerfile

     

       24
        
           volumes:

     

       25
        
            - knot_data:/home/git

     

       26
        
           ports:

     

       27
        
             - "2222:22"

     

       0
        
       
     

       28
        
       volumes:

     

       29
        
         caddy_data:

     

       30
        
         knot_data:

···

       1
        
       services:

     

       2
        
         frontend:

     

       3
        
           image: caddy:2-alpine

     

       4
       +
           command: >

     

       5
       +
             caddy

     

       6
       +
             reverse-proxy

     

       7
       +
             --from ${KNOT_SERVER_HOSTNAME}

     

       8
       +
             --to knotserver:5555

     

       9
        
           depends_on:

     

       10
        
             - knotserver

     

       11
        
           ports:

     
···

       14
        
             - "80:80"

     

       15
        
           volumes:

     

       16
        
             - caddy_data:/data

     

       17
       +
           restart: always

     

       18
        
         knotserver:

     

       19
        
           environment:

     

       20
        
            - KNOT_REPO_SCAN_PATH=/home/git

     
···

       23
        
            - APPVIEW_ENDPOINT=https://tangled.sh

     

       24
        
            - KNOT_SERVER_INTERNAL_LISTEN_ADDR=0.0.0.0:5444

     

       25
        
            - KNOT_SERVER_LISTEN_ADDR=0.0.0.0:5555

     

       26
       +
            - KNOT_SERVER_HOSTNAME=${KNOT_SERVER_HOSTNAME}

     

       27
       +
            - KNOT_SERVER_SECRET=${KNOT_SERVER_SECRET}

     

       28
        
           build:

     

       29
        
             dockerfile: Dockerfile

     

       30
        
           volumes:

     

       31
        
            - knot_data:/home/git

     

       32
        
           ports:

     

       33
        
             - "2222:22"

     

       34
       +
           restart: always

     

       35
        
       volumes:

     

       36
        
         caddy_data:

     

       37
        
         knot_data:

+3

gitconfig

···

       1
       +
       [user]

     

       2
       +
               name = Tangled

     

       3
       +
               email = noreply@tangled.sh

-2

knot.env.template

···

       1
       -
       KNOT_SERVER_HOSTNAME=<your hostname>

     

       2
       -
       KNOT_SERVER_SECRET=<secret string from the tangled.sh ui>

Compare changes