babbarc/workspaces-pipelines
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: babbarc:0e532495071ed395bc4045a520dcee369fde76bd
Branches Tags
babbarc:master
...
compare: babbarc:73f25ab8d24962dab50447ac0a50bb6849becac7
Branches Tags
babbarc:master

2 Commits
0e53249507 ... 73f25ab8d2

Author SHA1 Message Date
Pallav Vasa
73f25ab8d2 feat: pass private key as env variable SSH_KEY 2025-05-23 12:22:25 +00:00
Pallav Vasa
c84f7ec54f Revert "feat: pass private key as argument to start.sh" 
This reverts commit 5a2cab497c.
 2025-05-23 12:19:28 +00:00
1 changed files with 2 additions and 2 deletions
Expand all files Collapse all files

4
ssh_router.sh
View File

@ -118,7 +118,6 @@ start_container_if_needed() {
if ! podman container exists "$WORKSPACE"; then if ! podman container exists "$WORKSPACE"; then
log INFO "Creating container '$WORKSPACE'" log INFO "Creating container '$WORKSPACE'"
generate_gitconfig "$PERSON" generate_gitconfig "$PERSON"
read -r -d '' key <"$HOME"/secrets/"$WORKSPACE"/id_ed25519
podman run -dit \ podman run -dit \
--name "$WORKSPACE" \ --name "$WORKSPACE" \
--userns=keep-id:uid=1000,gid=1000 \ --userns=keep-id:uid=1000,gid=1000 \
@ -126,13 +125,14 @@ start_container_if_needed() {
--user "$DEV_USER" \ --user "$DEV_USER" \
--hostname "$WORKSPACE" \ --hostname "$WORKSPACE" \
--label auto-cleanup=true \ --label auto-cleanup=true \
-e SSH_KEY="$(cat $HOME/secrets/$WORKSPACE/id_ed25519)" \
-v "/mnt/private/workspaces-data/public/$WORKSPACE:/app/public" \ -v "/mnt/private/workspaces-data/public/$WORKSPACE:/app/public" \
-v "/mnt/private/workspaces-data/private/$WORKSPACE:/app/private" \ -v "/mnt/private/workspaces-data/private/$WORKSPACE:/app/private" \
-v "$HOME/secrets/$WORKSPACE/gitconfig:/home/$DEV_USER/.gitconfig:ro,Z" \ -v "$HOME/secrets/$WORKSPACE/gitconfig:/home/$DEV_USER/.gitconfig:ro,Z" \
-v "$HOME/secrets/$WORKSPACE/id_ed25519:/home/$DEV_USER/.ssh/id_ed25519:ro,Z" \ -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" \ -v "$HOME/secrets/$WORKSPACE/id_ed25519.pub:/home/$DEV_USER/.ssh/id_ed25519.pub:ro,Z" \
--entrypoint "/home/$DEV_USER/start.sh" \ --entrypoint "/home/$DEV_USER/start.sh" \
"$IMAGE" "$TMUX_SESSION" "$key" "$IMAGE" "$TMUX_SESSION"
elif ! podman inspect -f '{{.State.Running}}' "$WORKSPACE" | grep -q true; then elif ! podman inspect -f '{{.State.Running}}' "$WORKSPACE" | grep -q true; then
log INFO "Starting existing container '$WORKSPACE'" log INFO "Starting existing container '$WORKSPACE'"
podman start "$WORKSPACE" >/dev/null podman start "$WORKSPACE" >/dev/null