Compare commits
56 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
95b6480323 | ||
![]() |
2b19cccdbc | ||
![]() |
5483cf71bd | ||
![]() |
b0c6750585 | ||
![]() |
fce5d72b19 | ||
![]() |
bdac248845 | ||
![]() |
1c7bc517dd | ||
![]() |
1e8bb0521c | ||
![]() |
9577707dd5 | ||
![]() |
d15950f86c | ||
![]() |
50907b9519 | ||
![]() |
62d6833cdc | ||
![]() |
e5dc78049a | ||
![]() |
a3f393b844 | ||
![]() |
fd7e83ccff | ||
![]() |
bc7d65a24b | ||
![]() |
ed3dc4bb8f | ||
![]() |
9d0c18f94b | ||
![]() |
7f4913f942 | ||
![]() |
3c25755a27 | ||
![]() |
1a9023b25f | ||
![]() |
1652edccd0 | ||
![]() |
aa9dfca6c1 | ||
![]() |
2448ce6ab3 | ||
![]() |
c6503fa9dd | ||
![]() |
1ced08a364 | ||
![]() |
44eff8fc7f | ||
![]() |
bfcb9175ec | ||
![]() |
e319884921 | ||
![]() |
7e4aaa2dec | ||
![]() |
f0559a240f | ||
![]() |
a2ea4e6344 | ||
![]() |
bc3db0abae | ||
![]() |
77435d3748 | ||
![]() |
b7b09db4c5 | ||
![]() |
1b88c80669 | ||
![]() |
af579d1a7f | ||
![]() |
e6fff0c044 | ||
![]() |
ba052d78d4 | ||
![]() |
bc1cbfc772 | ||
![]() |
f8b38996df | ||
![]() |
d488a87dd4 | ||
![]() |
3e361cd03c | ||
![]() |
fd0c07e954 | ||
![]() |
d3f5e93ad8 | ||
![]() |
c9460b8ebc | ||
![]() |
9629c3253e | ||
![]() |
6e11d19510 | ||
![]() |
a4bfe5a5c0 | ||
![]() |
54a42ad4d5 | ||
![]() |
21eee8c3ec | ||
![]() |
ff72c95012 | ||
![]() |
3576bf93c2 | ||
![]() |
d7c7686a9e | ||
![]() |
a179a3ad23 | ||
![]() |
56744155cb |
@ -14,5 +14,5 @@ replace_home() {
|
|||||||
find .config -type d -exec chmod g+x {} +
|
find .config -type d -exec chmod g+x {} +
|
||||||
|
|
||||||
replace_home "$PWD" "/home/devuser"
|
replace_home "$PWD" "/home/devuser"
|
||||||
tar -czf home.tar.gz --owner root:0 --group secproc:1002 --xform "s,$PWD,/home/devuser," .config .local .ssh start.sh
|
tar --mode=a=r,u+w,a+x -czf home.tar.gz --owner root:0 --group root:0 --xform "s,$PWD,/home/devuser," .config .local .ssh
|
||||||
replace_home "/home/devuser" "$PWD"
|
replace_home "/home/devuser" "$PWD"
|
||||||
|
@ -1,39 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
YAML_FILE="access.yml"
|
|
||||||
TEMPLATE_FILE="gitconfig.template"
|
|
||||||
USER="$1"
|
|
||||||
|
|
||||||
# Extract user fields from YAML
|
|
||||||
GIT_NAME=$(yq ".\"$USER\".name" "$YAML_FILE")
|
|
||||||
GIT_EMAIL=$(yq ".\"$USER\".email" "$YAML_FILE")
|
|
||||||
|
|
||||||
# Ensure fields are not empty
|
|
||||||
if [[ -z "$GIT_NAME" || -z "$GIT_EMAIL" ]]; then
|
|
||||||
echo "❌ Error: User '$USER' not found or missing name/email in $YAML_FILE"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Create output directory
|
|
||||||
USER_DIR="files/$USER"
|
|
||||||
mkdir -p "$USER_DIR"
|
|
||||||
|
|
||||||
# Generate .gitconfig
|
|
||||||
env GIT_NAME="$GIT_NAME" GIT_EMAIL="$GIT_EMAIL" \
|
|
||||||
envsubst <"$TEMPLATE_FILE" >"$USER_DIR/gitconfig"
|
|
||||||
|
|
||||||
echo "✅ .gitconfig created at $USER_DIR/gitconfig"
|
|
||||||
|
|
||||||
# Generate SSH keypair if it doesn't exist
|
|
||||||
KEYFILE="$USER_DIR/id_ed25519"
|
|
||||||
|
|
||||||
if [[ -f "$KEYFILE" ]]; then
|
|
||||||
echo "🔑 SSH key already exists for $USER at $KEYFILE"
|
|
||||||
else
|
|
||||||
ssh-keygen -t ed25519 -N "" -C "$GIT_EMAIL" -f "$KEYFILE"
|
|
||||||
echo "✅ SSH keypair generated at:"
|
|
||||||
echo " 🔐 Private: $KEYFILE"
|
|
||||||
echo " 🔓 Public : $KEYFILE.pub"
|
|
||||||
fi
|
|
5
.bin/install-config.sh
Executable file
5
.bin/install-config.sh
Executable file
@ -0,0 +1,5 @@
|
|||||||
|
#!/usr/bin/env fish
|
||||||
|
|
||||||
|
fisher install patrickf1/fzf.fish jorgebucaran/autopair.fish gazorby/fish-abbreviation-tips jethrokuan/z
|
||||||
|
echo 'function fish_greeting; fortune; end' >"$HOME"/.config/fish/functions/fish_greeting.fish
|
||||||
|
echo 'starship init fish | source' >"$HOME"/.config/fish/config.fish
|
@ -24,7 +24,5 @@ if ! tmux has-session -t "$SESSION" 2>/dev/null; then
|
|||||||
tmux new-session -d -s "$SESSION" -n editor 'HOME='"$HOME"' XDG_STATE_HOME='"$HOME/.state"' /usr/bin/fish'
|
tmux new-session -d -s "$SESSION" -n editor 'HOME='"$HOME"' XDG_STATE_HOME='"$HOME/.state"' /usr/bin/fish'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tmux send-keys -t $SESSION:editor 'fisher install jorgebucaran/fisher pure-fish/pure patrickf1/fzf.fish jorgebucaran/autopair.fish gazorby/fish-abbreviation-tips jethrokuan/z' Enter
|
|
||||||
|
|
||||||
# Attach to it
|
# Attach to it
|
||||||
exec tmux attach -t "$SESSION"
|
exec tmux attach -t "$SESSION"
|
||||||
|
1
.config/fish/config.fish
Normal file
1
.config/fish/config.fish
Normal file
@ -0,0 +1 @@
|
|||||||
|
starship init fish | source
|
4
.config/fish/fish_plugins
Normal file
4
.config/fish/fish_plugins
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
patrickf1/fzf.fish
|
||||||
|
jorgebucaran/autopair.fish
|
||||||
|
gazorby/fish-abbreviation-tips
|
||||||
|
jethrokuan/z
|
1
.config/fish/functions/fish_greeting.fish
Normal file
1
.config/fish/functions/fish_greeting.fish
Normal file
@ -0,0 +1 @@
|
|||||||
|
function fish_greeting; fortune; end
|
@ -21,6 +21,7 @@
|
|||||||
"lazyvim.plugins.extras.lang.json",
|
"lazyvim.plugins.extras.lang.json",
|
||||||
"lazyvim.plugins.extras.lang.markdown",
|
"lazyvim.plugins.extras.lang.markdown",
|
||||||
"lazyvim.plugins.extras.lang.python",
|
"lazyvim.plugins.extras.lang.python",
|
||||||
|
"lazyvim.plugins.extras.lang.rust",
|
||||||
"lazyvim.plugins.extras.lang.scala",
|
"lazyvim.plugins.extras.lang.scala",
|
||||||
"lazyvim.plugins.extras.lang.sql",
|
"lazyvim.plugins.extras.lang.sql",
|
||||||
"lazyvim.plugins.extras.lang.toml",
|
"lazyvim.plugins.extras.lang.toml",
|
||||||
@ -35,4 +36,4 @@
|
|||||||
"NEWS.md": "10960"
|
"NEWS.md": "10960"
|
||||||
},
|
},
|
||||||
"version": 8
|
"version": 8
|
||||||
}
|
}
|
@ -431,9 +431,9 @@ tmux_conf_uninstall_plugins_on_reload=true
|
|||||||
# visit https://github.com/tmux-plugins for available plugins
|
# visit https://github.com/tmux-plugins for available plugins
|
||||||
#set -g @plugin 'tmux-plugins/tmux-copycat'
|
#set -g @plugin 'tmux-plugins/tmux-copycat'
|
||||||
#set -g @plugin 'tmux-plugins/tmux-cpu'
|
#set -g @plugin 'tmux-plugins/tmux-cpu'
|
||||||
#set -g @plugin 'tmux-plugins/tmux-resurrect'
|
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
||||||
#set -g @plugin 'tmux-plugins/tmux-continuum'
|
set -g @plugin 'tmux-plugins/tmux-continuum'
|
||||||
#set -g @continuum-restore 'on'
|
set -g @continuum-restore 'on'
|
||||||
|
|
||||||
set -g @plugin 'catppuccin/tmux'
|
set -g @plugin 'catppuccin/tmux'
|
||||||
|
|
||||||
|
7
.gitignore
vendored
7
.gitignore
vendored
@ -2,6 +2,11 @@ logs
|
|||||||
.local
|
.local
|
||||||
.cache
|
.cache
|
||||||
.state
|
.state
|
||||||
.config/fish
|
.config/fish/*/*
|
||||||
|
.config/fish/fish_variables
|
||||||
|
!.config/fish/config.fish
|
||||||
|
!.config/fish/fish_plugins
|
||||||
|
!.config/fish/functions/fish_greeting.fish
|
||||||
.npm
|
.npm
|
||||||
.config/nvim/lazy-lock.json
|
.config/nvim/lazy-lock.json
|
||||||
|
home.tar.gz
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
Host alps
|
Host alps
|
||||||
HostName 10.88.0.1
|
HostName 10.88.0.1
|
||||||
User git
|
User git
|
||||||
IdentityFile ~/.ssh/id_ed25519
|
|
||||||
IdentitiesOnly yes
|
IdentitiesOnly yes
|
||||||
StrictHostKeyChecking yes
|
StrictHostKeyChecking yes
|
||||||
Port 2222
|
Port 2222
|
||||||
@ -10,7 +9,6 @@ Host alps
|
|||||||
Host github
|
Host github
|
||||||
HostName github.com
|
HostName github.com
|
||||||
User git
|
User git
|
||||||
IdentityFile ~/.ssh/id_ed25519
|
|
||||||
IdentitiesOnly yes
|
IdentitiesOnly yes
|
||||||
StrictHostKeyChecking yes
|
StrictHostKeyChecking yes
|
||||||
ProxyCommand none
|
ProxyCommand none
|
||||||
|
77
.vscode/tasks.json
vendored
77
.vscode/tasks.json
vendored
@ -17,6 +17,14 @@
|
|||||||
"problemMatcher": [],
|
"problemMatcher": [],
|
||||||
"detail": "build podman image using buildah"
|
"detail": "build podman image using buildah"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"label": "GitOps(Build): all images",
|
||||||
|
"type": "shell",
|
||||||
|
"command": ".bin/gitops build all",
|
||||||
|
"group": "build",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"detail": "build podman image using buildah"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"label": "GitOps: Clean dangling images",
|
"label": "GitOps: Clean dangling images",
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
@ -25,44 +33,12 @@
|
|||||||
"detail": "Clean podman images"
|
"detail": "Clean podman images"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Gitops(Update): build-base.sh",
|
"label": "GitOps(Update): Containerfile",
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"command": ".bin/gitops update base",
|
"command": ".bin/gitops update containerfile",
|
||||||
"group": "build",
|
"group": "build",
|
||||||
"problemMatcher": [],
|
"problemMatcher": [],
|
||||||
"detail": "Copy build-base.sh to /home/infilytics/.local/bin/"
|
"detail": "Copy Containerfile to $HOME/"
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "GitOps(Update): build-workspace.sh",
|
|
||||||
"type": "shell",
|
|
||||||
"command": ".bin/gitops update workspace",
|
|
||||||
"group": "build",
|
|
||||||
"problemMatcher": [],
|
|
||||||
"detail": "Copy build-workspace.sh to /home/infilytics/.local/bin/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "GitOps(Update): ssh_router.sh",
|
|
||||||
"type": "shell",
|
|
||||||
"command": ".bin/gitops update ssh_router",
|
|
||||||
"group": "build",
|
|
||||||
"problemMatcher": [],
|
|
||||||
"detail": "Copy ssh_router.sh to /home/infilytics/.local/bin/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "GitOps(Update): access.yml",
|
|
||||||
"type": "shell",
|
|
||||||
"command": ".bin/gitops update access",
|
|
||||||
"group": "build",
|
|
||||||
"problemMatcher": [],
|
|
||||||
"detail": "Copy access.yml to /home/infilytics/"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"label": "GitOps(Update): gitops_router.sh",
|
|
||||||
"type": "shell",
|
|
||||||
"command": ".bin/gitops update gitops_router",
|
|
||||||
"group": "build",
|
|
||||||
"problemMatcher": [],
|
|
||||||
"detail": "Copy gitops_router.sh to /home/infilytics/.local/bin"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "GitOps(Update): home.tar.gz",
|
"label": "GitOps(Update): home.tar.gz",
|
||||||
@ -70,7 +46,23 @@
|
|||||||
"command": ".bin/gitops update home_tar",
|
"command": ".bin/gitops update home_tar",
|
||||||
"group": "build",
|
"group": "build",
|
||||||
"problemMatcher": [],
|
"problemMatcher": [],
|
||||||
"detail": "Copy home.tar.gz to /home/infilytics/"
|
"detail": "Copy home.tar.gz to $HOME/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "GitOps(Update): gitconfig.template",
|
||||||
|
"type": "shell",
|
||||||
|
"command": ".bin/gitops update gitconfig",
|
||||||
|
"group": "build",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"detail": "Copy gitconfig.template to $HOME/"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "GitOps(Update): start.sh",
|
||||||
|
"type": "shell",
|
||||||
|
"command": ".bin/gitops update start.sh",
|
||||||
|
"group": "build",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"detail": "Copy start.sh to $HOME/"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"label": "Create home tarball",
|
"label": "Create home tarball",
|
||||||
@ -102,6 +94,13 @@
|
|||||||
"problemMatcher": [],
|
"problemMatcher": [],
|
||||||
"detail": "run podman rm $args on remote"
|
"detail": "run podman rm $args on remote"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"label": "GitOps: Remove workspace image",
|
||||||
|
"type": "shell",
|
||||||
|
"command": ".bin/gitops rmi ${input:images}",
|
||||||
|
"problemMatcher": [],
|
||||||
|
"detail": "run podman rmi $args on remote"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"label": "Cleanup worktree",
|
"label": "Cleanup worktree",
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
@ -117,6 +116,12 @@
|
|||||||
"description": "Pick a container",
|
"description": "Pick a container",
|
||||||
"options": ["pallav", "palak", "param", "darshan"],
|
"options": ["pallav", "palak", "param", "darshan"],
|
||||||
"default": "pallav"
|
"default": "pallav"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "images",
|
||||||
|
"type": "promptString",
|
||||||
|
"description": "space separated list of images",
|
||||||
|
"default": ""
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
66
Containerfile
Normal file
66
Containerfile
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
# ───────────────────
|
||||||
|
# Stage 1: Base Image
|
||||||
|
# ───────────────────
|
||||||
|
FROM archlinux:base-devel-20250511.0.348143 as base
|
||||||
|
|
||||||
|
ARG DEV_USER=devuser
|
||||||
|
ARG DEV_UID=1000
|
||||||
|
ARG DEV_GID=1000
|
||||||
|
|
||||||
|
# Install all necessary packages and clean up cache
|
||||||
|
RUN pacman -Sy --noconfirm && \
|
||||||
|
pacman -S --noconfirm --needed \
|
||||||
|
base-devel neovim git git-lfs fish tmux go-yq rust starship podman \
|
||||||
|
nodejs python fzf fd ripgrep jdk-openjdk fisher yazi less rust-analyzer \
|
||||||
|
lazygit luarocks python-pynvim npm bash-completion tree-sitter-cli kitty-terminfo \
|
||||||
|
lua51 openssh fortune-mod podman-compose podman-docker && \
|
||||||
|
pacman -Scc --noconfirm && \
|
||||||
|
rm -rf /var/cache/pacman/pkg/* /usr/bin/sshd /usr/lib/systemd/system/sshd.service
|
||||||
|
|
||||||
|
# Create user/groups as per your script, with -l to avoid system user quirks
|
||||||
|
RUN groupadd -g $DEV_GID $DEV_USER && \
|
||||||
|
useradd -l -ms /bin/fish -u $DEV_UID -g $DEV_GID $DEV_USER
|
||||||
|
|
||||||
|
# ────────────────────────
|
||||||
|
# Stage 2: Workspace Image
|
||||||
|
# ────────────────────────
|
||||||
|
FROM base as workspace
|
||||||
|
|
||||||
|
ARG DEV_USER=devuser
|
||||||
|
ARG DEV_UID=1000
|
||||||
|
ARG DEV_GID=1000
|
||||||
|
ARG DEV_HOME=/home/$DEV_USER
|
||||||
|
ARG POD_USER=mypodmanuser
|
||||||
|
ARG POD_UID=1002
|
||||||
|
|
||||||
|
# Use ADD for extracting archives
|
||||||
|
ADD home.tar.gz $DEV_HOME
|
||||||
|
COPY --chmod=755 start.sh $DEV_HOME/
|
||||||
|
|
||||||
|
# Prepare .ssh and known_hosts, and fix permissions only if dirs exist
|
||||||
|
RUN mkdir -p $DEV_HOME/.ssh && \
|
||||||
|
touch /etc/containers/nodocker && \
|
||||||
|
ssh-keyscan -p 2222 10.88.0.1 >> $DEV_HOME/.ssh/known_hosts && \
|
||||||
|
ssh-keyscan -p 22 github.com >> $DEV_HOME/.ssh/known_hosts && \
|
||||||
|
for d in $DEV_HOME/.local \
|
||||||
|
$DEV_HOME/.config/fish/completions \
|
||||||
|
$DEV_HOME/.config/fish/functions \
|
||||||
|
$DEV_HOME/.config/fish/fish_variables \
|
||||||
|
$DEV_HOME/.ssh; do \
|
||||||
|
if [ -e "$d" ]; then chown -R $DEV_USER:$DEV_USER "$d"; fi; \
|
||||||
|
done && \
|
||||||
|
for d in $DEV_HOME/.local \
|
||||||
|
$DEV_HOME/.config \
|
||||||
|
$DEV_HOME/.config/fish \
|
||||||
|
$DEV_HOME/.config/tmux; do \
|
||||||
|
if [ -e "$d" ]; then chown $DEV_USER:$DEV_USER "$d"; fi; \
|
||||||
|
done
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
USER $DEV_USER
|
||||||
|
|
||||||
|
RUN podman system connection add my-remote --identity $DEV_HOME/.ssh/id_ed25519 \
|
||||||
|
ssh://$POD_USER@10.88.0.1/run/user/${POD_UID}/podman/podman.sock && \
|
||||||
|
podman system connection default my-remote
|
||||||
|
|
||||||
|
CMD ["/home/devuser/start.sh"]
|
30
access.yml
30
access.yml
@ -1,30 +0,0 @@
|
|||||||
pallav:
|
|
||||||
name: Pallav Vasa
|
|
||||||
email: pallav@infilytics.in
|
|
||||||
rw:
|
|
||||||
- darshan
|
|
||||||
- param
|
|
||||||
- palak
|
|
||||||
|
|
||||||
darshan:
|
|
||||||
name: Darshan Parmar
|
|
||||||
email: darshan@infilytics.in
|
|
||||||
rw:
|
|
||||||
- param
|
|
||||||
ro:
|
|
||||||
- pallav
|
|
||||||
|
|
||||||
param:
|
|
||||||
name: Param Makawana
|
|
||||||
email: param@infilytics.in
|
|
||||||
ro:
|
|
||||||
- pallav
|
|
||||||
- darshan
|
|
||||||
|
|
||||||
palak:
|
|
||||||
name: Palak Vasa
|
|
||||||
email: pakak@infilytics.in
|
|
||||||
ro:
|
|
||||||
- pallav
|
|
||||||
- param
|
|
||||||
- darshan
|
|
@ -1 +0,0 @@
|
|||||||
command="/home/infilytics/ssh_router.sh pallav",no-port-forwarding,no-agent-forwarding,no-X11-forwarding ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK0il/OJiXygyPWYBt05+OQYjJPxgGuP3kP9hLsD/C7x phoenix@sphinx
|
|
@ -1,24 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
BASE_IMG_NAME="analytics-backend-base"
|
|
||||||
DEV_USER=devuser
|
|
||||||
DEV_UID=1001
|
|
||||||
DEV_GID=1001
|
|
||||||
|
|
||||||
ctr=$(buildah from archlinux)
|
|
||||||
|
|
||||||
buildah run "$ctr" -- bash -c "
|
|
||||||
pacman -Sy --noconfirm && \
|
|
||||||
pacman -S --noconfirm --needed base-devel neovim git git-lfs fish tmux \
|
|
||||||
nodejs python podman fzf fd ripgrep jdk-openjdk fisher yazi less buildah \
|
|
||||||
lazygit luarocks python-pynvim npm bash-completion tree-sitter-cli kitty-terminfo \
|
|
||||||
lua51 openssh && \
|
|
||||||
pacman -Scc --noconfirm && \
|
|
||||||
groupadd -g $DEV_GID $DEV_USER && \
|
|
||||||
groupadd -g 1002 secproc && \
|
|
||||||
useradd -ms /bin/fish -G secproc -u $DEV_UID -g $DEV_GID $DEV_USER
|
|
||||||
"
|
|
||||||
|
|
||||||
buildah commit "$ctr" $BASE_IMG_NAME
|
|
||||||
echo "✅ $BASE_IMG_NAME built."
|
|
@ -1,32 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
BASE_IMG_NAME="analytics-backend-base"
|
|
||||||
IMG_NAME="analytics-backend-workspace"
|
|
||||||
DEV_USER=devuser
|
|
||||||
DEV_HOME=/home/$DEV_USER
|
|
||||||
|
|
||||||
ctr=$(buildah from "$BASE_IMG_NAME")
|
|
||||||
|
|
||||||
buildah add "$ctr" home.tar.gz $DEV_HOME
|
|
||||||
|
|
||||||
# shellcheck disable=SC2016
|
|
||||||
buildah run "$ctr" -- fish -c '
|
|
||||||
set -gx HOME '"$DEV_HOME"';
|
|
||||||
ssh-keyscan -p 2222 10.88.0.1 >> $HOME/.ssh/known_hosts;
|
|
||||||
ssh-keyscan -p 22 github.com >> $HOME/.ssh/known_hosts;
|
|
||||||
chown -R '"$DEV_USER"':'"$DEV_USER"' $HOME/.local $HOME/.config/fish/completions \
|
|
||||||
$HOME/.config/fish/functions $HOME/.config/fish/fish_variables $HOME/.ssh;
|
|
||||||
chown '"$DEV_USER"':'"$DEV_USER"' $HOME/.config $HOME/.config/fish \
|
|
||||||
$HOME/.config/tmux;
|
|
||||||
'
|
|
||||||
|
|
||||||
buildah config \
|
|
||||||
--user $DEV_USER \
|
|
||||||
--workingdir /app \
|
|
||||||
--env CONTAINER_HOST=unix:///run/podman/podman.sock \
|
|
||||||
--cmd "[\"$DEV_HOME/start.sh\"]" \
|
|
||||||
"$ctr"
|
|
||||||
|
|
||||||
buildah commit "$ctr" $IMG_NAME
|
|
||||||
echo "✅ $IMG_NAME built from $BASE_IMG_NAME."
|
|
114
gitops_router.sh
114
gitops_router.sh
@ -1,114 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
PERSON="$1"
|
|
||||||
HOST="alps:3222"
|
|
||||||
PROTOCOL="http"
|
|
||||||
REPO="babbarc/workspaces"
|
|
||||||
BRANCH="master"
|
|
||||||
|
|
||||||
LOG_FILE="/tmp/.gitops-router-${PERSON}.log"
|
|
||||||
|
|
||||||
log() {
|
|
||||||
local level="${1^^}" # convert to uppercase
|
|
||||||
shift
|
|
||||||
echo "[$(date '+%Y-%m-%d %H:%M:%S')] [$level] $*" | tee -a "$LOG_FILE"
|
|
||||||
}
|
|
||||||
|
|
||||||
log info "Received SSH_ORIGINAL_COMMAND: $SSH_ORIGINAL_COMMAND"
|
|
||||||
|
|
||||||
# Ensure the variable is set
|
|
||||||
if [[ -z "${SSH_ORIGINAL_COMMAND:-}" ]]; then
|
|
||||||
log error "No SSH_ORIGINAL_COMMAND provided."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
geturl() {
|
|
||||||
echo "$PROTOCOL://$HOST/$REPO/$1/branch/$BRANCH/$2"
|
|
||||||
}
|
|
||||||
|
|
||||||
function run() {
|
|
||||||
"$HOME"/.local/bin/"$1"
|
|
||||||
}
|
|
||||||
|
|
||||||
function update() {
|
|
||||||
type=${4:-raw}
|
|
||||||
fname=$(basename "$1")
|
|
||||||
output_path="$HOME/$2/$fname"
|
|
||||||
url=$(geturl "$type" "$1")
|
|
||||||
|
|
||||||
[ -f "$output_path" ] && chmod 700 "$output_path"
|
|
||||||
curl -fsSL "$url" -o "$output_path" && log info "Downloaded $url to $output_path"
|
|
||||||
chmod "$3" "$output_path"
|
|
||||||
}
|
|
||||||
|
|
||||||
clean_images() {
|
|
||||||
# Get list of image IDs with <none> tag (dangling images)
|
|
||||||
dangling_images=$(podman images -f "dangling=true" -q)
|
|
||||||
|
|
||||||
if [ -z "$dangling_images" ]; then
|
|
||||||
echo "✅ No dangling images to remove."
|
|
||||||
else
|
|
||||||
echo "⚠️ Removing dangling images..."
|
|
||||||
echo "$dangling_images" | xargs podman rmi
|
|
||||||
echo "🧹 Done!"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Strip arguments and parse command
|
|
||||||
read -r command args <<<"$SSH_ORIGINAL_COMMAND"
|
|
||||||
|
|
||||||
# Define command routing
|
|
||||||
case "$command" in
|
|
||||||
build)
|
|
||||||
case "$args" in
|
|
||||||
base)
|
|
||||||
run build-base.sh
|
|
||||||
;;
|
|
||||||
workspace)
|
|
||||||
run build-workspace.sh
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
log error "Invalid arguments for build command: $args"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
update)
|
|
||||||
case "$args" in
|
|
||||||
workspace)
|
|
||||||
update build-workspace.sh .local/bin 500
|
|
||||||
;;
|
|
||||||
base)
|
|
||||||
update build-base.sh .local/bin 500
|
|
||||||
;;
|
|
||||||
access)
|
|
||||||
update access.yml . 400
|
|
||||||
;;
|
|
||||||
ssh_router)
|
|
||||||
update ssh_router.sh .local/bin 500
|
|
||||||
;;
|
|
||||||
gitops_router)
|
|
||||||
update gitops_router.sh .local/bin 500
|
|
||||||
;;
|
|
||||||
home_tar)
|
|
||||||
update home.tar.gz . 500 media
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
log error "Invalid arguments for update command: $args"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
clean)
|
|
||||||
clean_images
|
|
||||||
;;
|
|
||||||
status)
|
|
||||||
podman images
|
|
||||||
;;
|
|
||||||
remove)
|
|
||||||
podman rm "$args"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
log error "Unknown command: $command"
|
|
||||||
exit 127
|
|
||||||
;;
|
|
||||||
esac
|
|
BIN
home.tar.gz
(Stored with Git LFS)
BIN
home.tar.gz
(Stored with Git LFS)
Binary file not shown.
187
ssh_router.sh
187
ssh_router.sh
@ -1,187 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
PERSON="$1"
|
|
||||||
WORKSPACE="$SSH_ORIGINAL_COMMAND"
|
|
||||||
IMAGE="localhost/analytics-backend-workspace:latest"
|
|
||||||
DEV_USER="devuser"
|
|
||||||
|
|
||||||
XDG_RUNTIME_DIR="/run/user/$(id -u)"
|
|
||||||
LOG_FILE="/tmp/.ssh-router-${PERSON}.log"
|
|
||||||
|
|
||||||
log() {
|
|
||||||
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*" >>"$LOG_FILE"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [[ ! -t 0 ]]; then
|
|
||||||
log "❌ No TTY allocated — refusing to run tmux without an interactive terminal"
|
|
||||||
echo "Error: No TTY. Use 'ssh -t'" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# log "🧩 IMAGE = '$IMAGE'"
|
|
||||||
# log "🧩 WORKSPACE = '$WORKSPACE'"
|
|
||||||
# log "🧩 PERSON = '$PERSON'"
|
|
||||||
|
|
||||||
# Fallbacks
|
|
||||||
if [[ -z "${WORKSPACE:-}" ]]; then
|
|
||||||
WORKSPACE="$PERSON"
|
|
||||||
log "ℹ️ Defaulted WORKSPACE to $WORKSPACE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
TMUX_SESSION="$WORKSPACE|analytics-backend"
|
|
||||||
|
|
||||||
# Start podman socket service if it's not running
|
|
||||||
if [[ ! -S "$XDG_RUNTIME_DIR/podman/podman.sock" ]]; then
|
|
||||||
log "🔄 Starting Podman socket service for user $USER"
|
|
||||||
systemctl --user start podman.socket || {
|
|
||||||
log "❌ Failed to start podman.socket via systemd"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Wait briefly for socket to appear
|
|
||||||
sleep 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ! -S "$XDG_RUNTIME_DIR/podman/podman.sock" ]]; then
|
|
||||||
log "❌ Podman socket still missing after startup attempt"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check if image exists locally
|
|
||||||
if ! podman image exists "$IMAGE"; then
|
|
||||||
log "📦 Image $IMAGE not found locally. Pulling from registry..."
|
|
||||||
|
|
||||||
# Attempt to pull the image from the local registry (insecure HTTP)
|
|
||||||
if ! podman pull --tls-verify=false "$IMAGE"; then
|
|
||||||
log "❌ Failed to pull image from $IMAGE"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
log "✅ Successfully pulled $IMAGE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
case "$SSH_ORIGINAL_COMMAND" in
|
|
||||||
*scp* | *sftp* | *rsync* | *tar*)
|
|
||||||
log "❌ File transfers are disabled"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Function to start the container if not running
|
|
||||||
start_container_if_needed() {
|
|
||||||
if ! podman container exists "$WORKSPACE"; then
|
|
||||||
log "🚀 Creating container $WORKSPACE..."
|
|
||||||
podman run -dit \
|
|
||||||
--userns=keep-id \
|
|
||||||
--name "$WORKSPACE" \
|
|
||||||
--user "$DEV_USER" \
|
|
||||||
--hostname "$WORKSPACE" \
|
|
||||||
--label auto-cleanup=true \
|
|
||||||
-v "${XDG_RUNTIME_DIR}"/podman/podman.sock:/run/podman/podman.sock \
|
|
||||||
-v /home/infilytics/data/"$WORKSPACE":/app \
|
|
||||||
-v /home/infilytics/secrets/"$WORKSPACE"/gitconfig:/home/"$DEV_USER"/.gitconfig:ro \
|
|
||||||
-v /home/infilytics/secrets/"$WORKSPACE"/id_ed25519:/home/"$DEV_USER"/.ssh/id_ed25519:ro \
|
|
||||||
-v /home/infilytics/secrets/"$WORKSPACE"/id_ed25519.pub:/home/"$DEV_USER"/.ssh/id_ed25519.pub:ro \
|
|
||||||
--entrypoint "/home/$DEV_USER/start.sh" \
|
|
||||||
"$IMAGE" "${TMUX_SESSION}"
|
|
||||||
elif ! podman inspect -f '{{.State.Running}}' "$WORKSPACE" | grep -q true; then
|
|
||||||
log "⚡ Starting existing container $WORKSPACE..."
|
|
||||||
podman start "$WORKSPACE" >/dev/null 2>&1
|
|
||||||
fi
|
|
||||||
sleep 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# After devuser exits...
|
|
||||||
check_devuser_attached() {
|
|
||||||
# Get list of clients
|
|
||||||
client_users=$(podman exec "$WORKSPACE" tmux list-clients -t "$TMUX_SESSION" -F "#{client_user}" 2>/dev/null)
|
|
||||||
|
|
||||||
if echo "$client_users" | grep -q "$DEV_USER"; then
|
|
||||||
log "💡 devuser still attached — container stays running"
|
|
||||||
return 0
|
|
||||||
else
|
|
||||||
log "🏃 $PERSON has logged out — stopping container"
|
|
||||||
podman stop "$WORKSPACE" >/dev/null 2>&1
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
get_access_mode() {
|
|
||||||
local yaml_file="access.yml"
|
|
||||||
local workspace="$1"
|
|
||||||
local person="$2"
|
|
||||||
|
|
||||||
if [[ ! "$workspace" =~ ^[a-zA-Z0-9._-]+$ ]]; then
|
|
||||||
log "❌ Invalid container name: $WORKSPACE"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Special case: user accessing their own workspace
|
|
||||||
if [[ "$workspace" == "$person" ]]; then
|
|
||||||
echo "access=rw"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check rw
|
|
||||||
if yq '.["'"$person"'"].rw // []' "$yaml_file" | grep -q "\b$workspace\b"; then
|
|
||||||
echo "access=rw"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check ro
|
|
||||||
if yq '.["'"$person"'"].ro // []' "$yaml_file" | grep -q "\b$workspace\b"; then
|
|
||||||
echo "access=ro"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
# No access → exit with error
|
|
||||||
log "❌ $person has no access to $workspace" >&2
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# === Main ===
|
|
||||||
|
|
||||||
read -r access_line < <(get_access_mode "$WORKSPACE" "$PERSON") || exit 1
|
|
||||||
MODE="${access_line#access=}"
|
|
||||||
|
|
||||||
case "$MODE" in
|
|
||||||
rw)
|
|
||||||
start_container_if_needed
|
|
||||||
|
|
||||||
# Run tmux session inside the container
|
|
||||||
if ! podman exec -it --user "$DEV_USER" "$WORKSPACE" tmux has-session -t "$TMUX_SESSION" >/dev/null 2>&1; then
|
|
||||||
if ! podman exec -it -e EDITOR=nvim --user "$DEV_USER" "$WORKSPACE" tmux new-session -d -s "$TMUX_SESSION" >/dev/null 2>&1; then
|
|
||||||
log "❌ Could not create new tmux session. Please contact admin or try again later."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
log "⚡ $PERSON is working on $WORKSPACE's workspace"
|
|
||||||
if ! podman exec -it -e TERM="$TERM" --user "$DEV_USER" "$WORKSPACE" tmux attach -t "$TMUX_SESSION"; then
|
|
||||||
log "❌ Could not attach to tmux session. Please contact admin or try again later."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
log "⚡ $PERSON finished working on $WORKSPACE's worksapce"
|
|
||||||
|
|
||||||
check_devuser_attached
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
ro)
|
|
||||||
if (podman container exists "$WORKSPACE" && podman inspect -f '{{.State.Running}}' "$WORKSPACE" | grep -q true) >/dev/null 2>&1; then
|
|
||||||
log "📜 $PERSON is viewing $WORKSPACE's workspace"
|
|
||||||
if ! podman exec -it -e TERM="$TERM" --user "$DEV_USER" "$WORKSPACE" tmux attach -r -t "$TMUX_SESSION"; then
|
|
||||||
log "❌ Could not attach to tmux session. Please contact admin or try again later."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
log "🏃 $PERSON stopped viewing $WORKSPACE's workspace"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
log "❌ Workspace for $WORKSPACE does not exist."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
log "❌ Invalid access mode: $MODE"
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
esac
|
|
Loading…
x
Reference in New Issue
Block a user