Merge pull request #6 from carapace-sh/devcontainer

repleced `shell` with `dev` container

Author: rsteube

.github/workflows/docker.yml

@@ -29,9 +29,9 @@ jobs:
         run: docker compose build mdbook shell-*
 
       - name: Build shell-* dependent image
-        run: docker compose build shell
+        run: docker compose build dev
 
-      - name: Build shell dependent image
+      - name: Build dev dependent image
         run: docker compose build vhs
 
       - name: Upload the images
@@ -49,7 +49,7 @@ jobs:
           docker image tag ghcr.io/carapace-sh/shell-tcsh       ghcr.io/carapace-sh/shell-tcsh:${tag}
           docker image tag ghcr.io/carapace-sh/shell-xonsh      ghcr.io/carapace-sh/shell-xonsh:${tag}
           docker image tag ghcr.io/carapace-sh/shell-zsh        ghcr.io/carapace-sh/shell-zsh:${tag}
-          docker image tag ghcr.io/carapace-sh/shell            ghcr.io/carapace-sh/shell:${tag}
+          docker image tag ghcr.io/carapace-sh/dev              ghcr.io/carapace-sh/dev:${tag}
           docker image tag ghcr.io/carapace-sh/vhs              ghcr.io/carapace-sh/vhs:${tag}
 
           docker image push ghcr.io/carapace-sh/base:${tag}
@@ -63,5 +63,5 @@ jobs:
           docker image push ghcr.io/carapace-sh/shell-tcsh:${tag}
           docker image push ghcr.io/carapace-sh/shell-xonsh:${tag}
           docker image push ghcr.io/carapace-sh/shell-zsh:${tag}
-          docker image push ghcr.io/carapace-sh/shell:${tag}
+          docker image push ghcr.io/carapace-sh/dev:${tag}
           docker image push ghcr.io/carapace-sh/vhs:${tag}

README.md

@@ -15,8 +15,8 @@ Build/test containers.
 | [shell-tcsh](./shell-tcsh/Dockerfile)             | base+[tcsh]       |
 | [shell-xonsh](./shell-xonsh/Dockerfile)           | base+[xonsh]      |
 | [shell-zsh](./shell-zsh/Dockerfile)               | base+[zsh]        |
-| [shell](./shell/Dockerfile)                       | base+shell-*      |
-| [vhs](./vhs/Dockerfile)                           | shell+[vhs]       |
+| [dev](./dev/Dockerfile)                           | base+[go]+shell-* |
+| [vhs](./vhs/Dockerfile)                           | dev+[vhs]         |
 
 Additional init file instruction (e.g. `.bashrc`) can be set with:
 
@@ -44,4 +44,5 @@ Additional init file instruction (e.g. `.bashrc`) can be set with:
 [tcsh]:https://www.tcsh.org/
 [xonsh]:https://github.com/xonsh/xonsh
 [zsh]:https://www.zsh.org/
+[go]:https://go.dev/
 [vhs]:https://github.com/charmbracelet/vhs

base/entrypoint.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-[ -z "$RC_BASH" ]        || echo "$RC_BASH"        >> ~/.bashrc
+[ -z "$RC_BASH" ]        || echo "$RC_BASH"        >> /root/.bashrc
 [ -z "$RC_BASH_BLE" ]    || echo "$RC_BASH_BLE"    >> /root/.config/bash-ble/blerc
 [ -z "$RC_ELVISH" ]      || echo "$RC_ELVISH"      >> /root/.config/elvish/rc.elv
 [ -z "$RC_FISH" ]        || echo "$RC_FISH"        >> /root/.config/fish/config.fish

compose.yaml

@@ -5,8 +5,7 @@ services:
 
   mdbook:
     build: mdbook
-    image: ghcr.io/carapace-sh/mdbook
-    
+    image: ghcr.io/carapace-sh/mdbook    
 
   shell-bash-ble:
     build: shell-bash-ble
@@ -44,9 +43,9 @@ services:
     build: shell-zsh
     image: ghcr.io/carapace-sh/shell-zsh
 
-  shell:
-    build: shell
-    image: ghcr.io/carapace-sh/shell
+  dev:
+    build: dev
+    image: ghcr.io/carapace-sh/dev
 
   vhs:
     build: vhs

shell/Dockerfile renamed to dev/Dockerfile

@@ -1,6 +1,9 @@
 FROM ghcr.io/carapace-sh/base
 
-RUN apt-get update && apt-get install -y fish libicu72 xonsh zsh
+RUN apt-get update && apt-get install -y fish git libicu72 xonsh zsh
+
+RUN curl -L https://go.dev/dl/go1.23.4.linux-amd64.tar.gz | tar -C /usr/local -xzf -
+ENV PATH=$PATH:/usr/local/go/bin
 
 COPY --from=ghcr.io/carapace-sh/shell-bash-ble /usr/local/bin/bash-ble /usr/local/bin/bash-ble
 COPY --from=ghcr.io/carapace-sh/shell-bash-ble /root/.config/bash-ble /root/.config/bash-ble

vhs/Dockerfile

@@ -1,14 +1,10 @@
-FROM ghcr.io/carapace-sh/shell
+FROM ghcr.io/carapace-sh/dev
 
 RUN apt-get update && apt-get install -y chromium ffmpeg fonts-jetbrains-mono
 
-
 RUN curl -L https://github.com/tsl0922/ttyd/releases/download/1.7.7/ttyd.x86_64 > /usr/local/bin/ttyd \
  && chmod +x /usr/local/bin/ttyd
 
-RUN apt-get install -y git
-RUN curl -L https://go.dev/dl/go1.23.4.linux-amd64.tar.gz | tar -C /usr/local -xzf -
-ENV PATH=$PATH:/usr/local/go/bin
 RUN git clone https://github.com/rsteube/vhs --depth 1 \
  && cd vhs \
  && GOBIN=/usr/local/bin/ go install