comparing old and main on ionchy.ca/knot-docker

+3

rootfs/etc/ssh/sshd_config.d/authorized_keys_command.conf

···

       1
       1
       +
       Match User git

     

       2
       2
       +
         AuthorizedKeysCommand /usr/bin/knot keys -o authorized-keys -git-dir /home/git/repositories

     

       3
       3
       +
         AuthorizedKeysCommandUser nobody

+5 -1

docker-compose.yml

···

       1
       1
        
       services:

     

       2
       2
        
         knot:

     

       3
       3
       -
           build: .

     

       3
       3
       +
           build:

     

       4
       4
       +
             context: .

     

       5
       5
       +
             args:

     

       6
       6
       +
               UID: 1000

     

       7
       7
       +
               GID: 1000

     

       4
       8
        
           environment:

     

       5
       9
        
             KNOT_SERVER_HOSTNAME: ${KNOT_SERVER_HOSTNAME}

     

       6
       10
        
             KNOT_SERVER_OWNER: ${KNOT_SERVER_OWNER}

+16 -2

readme.md

···

       29
       29
        
       The command above for example will build the latest commit on the `master`

     

       30
       30
        
       branch.

     

       31
       31
        
       

     

       32
       32
       +
       By default it will also create a `git` user with user and group ID 1000:1000,

     

       33
       33
       +
       but you can change it with the `UID` and `GID` build arguments.

     

       34
       34
       +
       

     

       35
       35
       +
       ```sh

     

       36
       36
       +
       docker build -t knot:latest --build-arg UID=$(id -u) GID=$(id -g)

     

       37
       37
       +
       ```

     

       38
       38
       +
       

     

       39
       39
       +
       The command above for example will create a user with the host user's UID and GID.

     

       40
       40
       +
       This is useful if you are bind mounting the repositories and app folder on the host,

     

       41
       41
       +
       as in the provided `docker-compose.yml` file.

     

       42
       42
       +
       

     

       32
       43
        
       <hr style="margin-bottom: 20px; margin-top: 10px" />

     

       33
       44
        
       

     

       34
       34
       -
       When using compose, it can be specified as a build argument which will be

     

       45
       45
       +
       When using compose, these can be specified as build arguments which will be

     

       35
       46
        
       passed to the builder.

     

       36
       47
        
       

     

       37
       48
        
       ```yaml

     

       38
       49
        
       build:

     

       39
       50
        
         context: .

     

       40
       40
       -
         args: { TAG: master }

     

       51
       51
       +
         args:

     

       52
       52
       +
           TAG: master

     

       53
       53
       +
           UID: 1000

     

       54
       54
       +
           GID: 1000

     

       41
       55
        
       ```

     

       42
       56
        
       

     

       43
       57
        
       This will for example tell docker to build it using the `master` branch like

Compare changes