Compare commits
6 Commits
0e53249507
...
master
Author | SHA1 | Date | |
---|---|---|---|
3a4773ebce | |||
b88313f598 | |||
8375989fd2 | |||
b41097d23d | |||
73f25ab8d2 | |||
c84f7ec54f |
@ -160,6 +160,7 @@ update)
|
||||
containerfile) update 0 Containerfile . 500 ;;
|
||||
access) update 2 access.yml . 400 ;;
|
||||
authorized_keys) update 2 authorized_keys .ssh 400 ;;
|
||||
secret_key) update 2 keys/"${args[1]}"/id_ed25519 secrets/"${args[1]}" 400 ;;
|
||||
podman_access)
|
||||
update 2 podman_access.keys . 400
|
||||
scp podman_access.keys mypodmanuser@alps:~/.ssh/authorized_keys
|
||||
|
@ -118,7 +118,6 @@ start_container_if_needed() {
|
||||
if ! podman container exists "$WORKSPACE"; then
|
||||
log INFO "Creating container '$WORKSPACE'"
|
||||
generate_gitconfig "$PERSON"
|
||||
read -r -d '' key <"$HOME"/secrets/"$WORKSPACE"/id_ed25519
|
||||
podman run -dit \
|
||||
--name "$WORKSPACE" \
|
||||
--userns=keep-id:uid=1000,gid=1000 \
|
||||
@ -132,7 +131,7 @@ start_container_if_needed() {
|
||||
-v "$HOME/secrets/$WORKSPACE/id_ed25519:/home/$DEV_USER/.ssh/id_ed25519:ro,Z" \
|
||||
-v "$HOME/secrets/$WORKSPACE/id_ed25519.pub:/home/$DEV_USER/.ssh/id_ed25519.pub:ro,Z" \
|
||||
--entrypoint "/home/$DEV_USER/start.sh" \
|
||||
"$IMAGE" "$TMUX_SESSION" "$key"
|
||||
"$IMAGE" "$TMUX_SESSION"
|
||||
elif ! podman inspect -f '{{.State.Running}}' "$WORKSPACE" | grep -q true; then
|
||||
log INFO "Starting existing container '$WORKSPACE'"
|
||||
podman start "$WORKSPACE" >/dev/null
|
||||
|
Reference in New Issue
Block a user