diff --git a/containers/fedora/config/bashrc b/containers/fedora/config/bashrc index b91273f..c5cc3fa 100644 --- a/containers/fedora/config/bashrc +++ b/containers/fedora/config/bashrc @@ -4,6 +4,7 @@ export EDITOR=nvim \ WAYLAND_DISPLAY=wayland-0 \ XDG_RUNTIME_DIR=/run/user/1000 \ + SSH_AUTH_SOCK=/run/user/1000/ssh-auth-sock \ PS1="\[\e[30;46m\] \h | \w \[\e[0;36m\]\[\e[m\] " \ TZ="Europe/Amsterdam" diff --git a/containers/fedora/config/git b/containers/fedora/config/git index fd89426..d898cb2 100644 --- a/containers/fedora/config/git +++ b/containers/fedora/config/git @@ -1,7 +1,7 @@ [user] email = job@plabble.org name = Job79 - signingKey = ~/.ssh/id_ed25519.pub + signingKey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPsqM6ABAaCTQZ+llFXD3CXrYYuIHDEnvz8IBbXddYEc job@plabble.org [gpg] format = ssh [commit] diff --git a/containers/go/config.sh b/containers/go/config.sh index 71f779f..276f925 100644 --- a/containers/go/config.sh +++ b/containers/go/config.sh @@ -1,2 +1,2 @@ #!/bin/bash -arg "-v $HOME/Documents/devc/go:/home/user/projects" +arg "-v $HOME/Documents/containers/go:/home/user/projects" diff --git a/containers/infra/config.sh b/containers/infra/config.sh index 43842d4..efcc191 100644 --- a/containers/infra/config.sh +++ b/containers/infra/config.sh @@ -1,2 +1,2 @@ #!/bin/bash -arg "-v $HOME/Documents/devc/infra:/home/user/projects" +arg "-v $HOME/Documents/containers/infra:/home/user/projects" diff --git a/devc.sh b/devc.sh index 60bbc97..a5d0191 100755 --- a/devc.sh +++ b/devc.sh @@ -29,6 +29,9 @@ default_args() { # clipboard (wl-copy) and gui applications working. [ -e "/run/user/$UID/wayland-0" ] && arg "-v /run/user/$UID/wayland-0:/run/user/1000/wayland-0" + # Mount the ssh socket to get ssh working. + [ -e "$SSH_AUTH_SOCK" ] && arg "-v $SSH_AUTH_SOCK:/run/user/1000/ssh-auth-sock" + # Make the user home dir a volume so it survives container # restarts. Use copy to keep the homedir files from the image. arg "-v $name:/home/user:copy"