updated versions

.github/workflows/docker.yml

@@ -1,11 +1,8 @@
 name: Docker
 
 on:
+  pull_request:
   push:
-    branches:
-      - 'master'
-    tags:
-      - 'v*'
 
 jobs:
   docker:
@@ -15,13 +12,6 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v4
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Build base image
         run: docker compose build base
 
@@ -34,7 +24,16 @@ jobs:
       - name: Build dev dependent image
         run: docker compose build vhs
 
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v4
+        if: "github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')"
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Upload the images
+        if: "github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')"
         run: |
           tag=latest
           [[ "$GITHUB_REF" =~ ^refs/tags/ ]] && tag="${GITHUB_REF/refs\/tags\//}"

base/Dockerfile

@@ -2,7 +2,7 @@ FROM debian:bookworm-slim AS base
 
 RUN apt-get update && apt-get install -y curl
 
-ARG version=1.21.1
+ARG version=1.24.2
 RUN curl -L "https://github.com/starship/starship/releases/download/v${version}/starship-x86_64-unknown-linux-gnu.tar.gz" | tar -xvz starship \
  && mv starship /usr/local/bin/
 

dev/Dockerfile

@@ -4,7 +4,7 @@ RUN apt-get update && apt-get install -y fish git libicu72 xonsh zsh
 
 RUN git config --system safe.directory '*'
 
-RUN curl -L https://go.dev/dl/go1.25.5.linux-amd64.tar.gz | tar -C /usr/local -xzf -
+RUN curl -L https://go.dev/dl/go1.26.1.linux-amd64.tar.gz | tar -C /usr/local -xzf -
 ENV PATH=$PATH:/usr/local/go/bin
 
 COPY --from=ghcr.io/carapace-sh/shell-cmd /usr/local/bin/cmd /usr/local/bin/cmd
@@ -24,9 +24,8 @@ COPY --from=ghcr.io/carapace-sh/shell-fish /root/.config/fish /root/.config/fish
 COPY --from=ghcr.io/carapace-sh/shell-nushell /usr/local/bin/nu /usr/local/bin/nu
 COPY --from=ghcr.io/carapace-sh/shell-nushell /root/.config/nushell /root/.config/nushell
 
+COPY --from=ghcr.io/carapace-sh/shell-oil /usr/local/bin/oils-for-unix /usr/local/bin/oils-for-unix
 COPY --from=ghcr.io/carapace-sh/shell-oil /usr/local/bin/osh /usr/local/bin/osh
-COPY --from=ghcr.io/carapace-sh/shell-oil /usr/local/bin/oil /usr/local/bin/oil
-COPY --from=ghcr.io/carapace-sh/shell-oil /usr/local/bin/oil.ovm /usr/local/bin/oil.ovm
 COPY --from=ghcr.io/carapace-sh/shell-oil /usr/local/bin/ysh /usr/local/bin/ysh
 COPY --from=ghcr.io/carapace-sh/shell-oil /root/.config/oils /root/.config/oils
 

shell-nushell/Dockerfile

@@ -1,5 +1,5 @@
 FROM ghcr.io/carapace-sh/base
-ARG version=0.101.0
+ARG version=0.111.0
 
 RUN curl -L https://github.com/nushell/nushell/releases/download/${version}/nu-${version}-x86_64-unknown-linux-gnu.tar.gz | tar -xvz \
  && mv nu-${version}-x86_64-unknown-linux-gnu/nu /usr/local/bin

shell-oil/Dockerfile

@@ -1,11 +1,11 @@
 FROM ghcr.io/carapace-sh/base AS oil
-ARG version=0.27.0
+ARG version=0.37.0
 
-RUN apt-get update && apt-get install -y gcc make libreadline-dev
-RUN curl http://oils.pub/download/oil-${version}.tar.gz | tar -xvz \
-  && cd oil-*/ \
+RUN apt-get update && apt-get install -y gcc g++ make libreadline-dev
+RUN curl http://oils.pub/download/oils-for-unix-${version}.tar.gz | tar -xvz \
+  && cd oils-*/ \
   && ./configure \
-  && make \
+  && _build/oils.sh \
   && ./install
 
 FROM ghcr.io/carapace-sh/base

shell-powershell/Dockerfile

@@ -1,5 +1,5 @@
 FROM ghcr.io/carapace-sh/base
-ARG version=7.4.6
+ARG version=7.5.4
 ARG build=1
 
 RUN apt-get update && apt-get install -y libicu72