Compare commits

..

9 Commits

Author SHA1 Message Date
Pallav Vasa
95b6480323 Revert "feat: add ssh key into memory"
This reverts commit 2b19cccdbc.
2025-05-23 15:14:08 +00:00
Pallav Vasa
2b19cccdbc feat: add ssh key into memory 2025-05-23 12:12:35 +00:00
Pallav Vasa
5483cf71bd feat: remove secproc group and copy start.sh separately 2025-05-23 11:59:44 +00:00
Pallav Vasa
b0c6750585 feat: remove default key paths 2025-05-23 11:59:16 +00:00
Pallav Vasa
fce5d72b19 feat: set mode, remove secproc group and remove start.sh from tarball 2025-05-23 11:59:00 +00:00
Pallav Vasa
bdac248845 chore: add task to update start.sh script in $HOME/ 2025-05-23 09:50:48 +00:00
Pallav Vasa
1c7bc517dd feat: modify UID:GID to 1000:1000 for container 2025-05-22 16:49:48 +00:00
Pallav Vasa
1e8bb0521c Revert "feat: add devuser to group appuser 1003"
This reverts commit d15950f86c.
2025-05-22 16:10:49 +00:00
Pallav Vasa
9577707dd5 fix: add comma between groups 2025-05-21 15:13:20 +00:00
4 changed files with 15 additions and 9 deletions

View File

@@ -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"

View File

@@ -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

8
.vscode/tasks.json vendored
View File

@@ -56,6 +56,14 @@
"problemMatcher": [], "problemMatcher": [],
"detail": "Copy gitconfig.template to $HOME/" "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",
"type": "shell", "type": "shell",

View File

@@ -4,8 +4,8 @@
FROM archlinux:base-devel-20250511.0.348143 as base FROM archlinux:base-devel-20250511.0.348143 as base
ARG DEV_USER=devuser ARG DEV_USER=devuser
ARG DEV_UID=1001 ARG DEV_UID=1000
ARG DEV_GID=1001 ARG DEV_GID=1000
# Install all necessary packages and clean up cache # Install all necessary packages and clean up cache
RUN pacman -Sy --noconfirm && \ RUN pacman -Sy --noconfirm && \
@@ -19,8 +19,7 @@ RUN pacman -Sy --noconfirm && \
# Create user/groups as per your script, with -l to avoid system user quirks # Create user/groups as per your script, with -l to avoid system user quirks
RUN groupadd -g $DEV_GID $DEV_USER && \ RUN groupadd -g $DEV_GID $DEV_USER && \
groupadd -g 1002 secproc && groupadd -g 1003 appdata && \ useradd -l -ms /bin/fish -u $DEV_UID -g $DEV_GID $DEV_USER
useradd -l -ms /bin/fish -G secproc appdata -u $DEV_UID -g $DEV_GID $DEV_USER
# ──────────────────────── # ────────────────────────
# Stage 2: Workspace Image # Stage 2: Workspace Image
@@ -28,14 +27,15 @@ RUN groupadd -g $DEV_GID $DEV_USER && \
FROM base as workspace FROM base as workspace
ARG DEV_USER=devuser ARG DEV_USER=devuser
ARG DEV_UID=1001 ARG DEV_UID=1000
ARG DEV_GID=1001 ARG DEV_GID=1000
ARG DEV_HOME=/home/$DEV_USER ARG DEV_HOME=/home/$DEV_USER
ARG POD_USER=mypodmanuser ARG POD_USER=mypodmanuser
ARG POD_UID=1002 ARG POD_UID=1002
# Use ADD for extracting archives # Use ADD for extracting archives
ADD home.tar.gz $DEV_HOME 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 # Prepare .ssh and known_hosts, and fix permissions only if dirs exist
RUN mkdir -p $DEV_HOME/.ssh && \ RUN mkdir -p $DEV_HOME/.ssh && \