Removed unnecessary branch name in Actions workflow.

.gitea/workflows/neovim_container_docker_build.yml

@@ -1,32 +1,34 @@
+# .gitea/workflows/docker-build-push.yml
 name: Build and Push Docker Image
 
 on:
   push:
+    branches:
+      - master
     tags:
-      - "v*"
+      - "v*" # triggers when you push a tag like v1.0.0
+    paths:
+      - "**/Dockerfile"
 
-  workflow_dispatch:
+  workflow_dispatch: # manual run button
 
 jobs:
-  build-push:
+  build-and-push:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to Gitea Container Registry
         uses: docker/login-action@v3
         with:
-          registry: gitea.setlock.net
+          registry: gitea.example.com
-          username: ${{ secrets.USER }}
+          username: ${{ secrets.GITEA_USERNAME }}
-          password: ${{ secrets.TOKEN }}
+          password: ${{ secrets.GITEA_TOKEN }}
 
       - name: Extract Tag Name (if any)
         id: get_tag
@@ -36,9 +38,9 @@ jobs:
       - name: Build and Push Docker Image
         uses: docker/build-push-action@v5
         with:
-          context: ./tools
+          context: ./nvim/tools
           push: true
           platforms: linux/amd64,linux/arm64
           tags: |
-            gitea.setlock.net/shaun/dev-container:latest
+            https://gitea.setlock.net/shaun/dotfiles:latest
-            gitea.setlock.net/shaun/dev-container:${{ env.GIT_TAG }}
+            https://gitea.setlock.net/shaun/dotfiles:${{ env.GIT_TAG }}

.gitea/workflows/nightly_docker_build.yml

@@ -1,37 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  schedule:
-    - cron: "0 2 * * *"
-
-  workflow_dispatch:
-
-jobs:
-  build-push:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.setlock.net
-          username: ${{ secrets.USER }}
-          password: ${{ secrets.TOKEN }}
-
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
-        with:
-          context: ./tools
-          push: true
-          platforms: linux/amd64,linux/arm64
-          tags: |
-            gitea.setlock.net/shaun/dev-container:nightly

nvim/tools/Dockerfile

@@ -16,9 +16,9 @@ RUN useradd -m -u 1000 -s /usr/bin/fish shaun
 
 # Install required software
 RUN apt-get update && apt-get -y install \
-  curl fzf ripgrep tree git xclip python3 python3-pip python3-venv nodejs npm \
+    curl fzf ripgrep tree git xclip python3 python3-pip python3-venv nodejs npm \
-  tzdata ninja-build gettext libtool libtool-bin autoconf automake cmake g++ \
+    tzdata ninja-build gettext libtool libtool-bin autoconf automake cmake g++ \
-  pkg-config zip unzip fish tmux
+    pkg-config zip unzip fish tmux
 
 # Cooperate Neovim with Python 3.
 RUN python3 -m pip install --break-system-packages --root-user-action ignore pynvim
@@ -28,9 +28,9 @@ RUN npm i -g neovim
 
 # Install Neovim from source.
 RUN mkdir -p /tmp/neovim-src && \
-  git clone --depth 1 --branch stable https://github.com/neovim/neovim /tmp/neovim-src && \
+    git clone --depth 1 --branch stable https://github.com/neovim/neovim /tmp/neovim-src && \
-  cd /tmp/neovim-src && make -j$(nproc) && make install && \
+    cd /tmp/neovim-src && make -j$(nproc) && make install && \
-  rm -rf /tmp/neovim-src
+    rm -rf /tmp/neovim-src
 
 # Clone configuration files.
 USER shaun
@@ -48,7 +48,7 @@ RUN ln -s /home/shaun/dotfiles/tmux /home/shaun/.config
 
 # Install tmux plugin manager.
 RUN git clone https://github.com/tmux-plugins/tpm /home/shaun/.config/tmux/plugins/tpm && \
-  /home/shaun/.config/tmux/plugins/tpm/scripts/install_plugins.sh
+    /home/shaun/.config/tmux/plugins/tpm/scripts/install_plugins.sh
 
 # Get oh-my-fish and bob-the-fish installed.
 RUN curl https://raw.githubusercontent.com/oh-my-fish/oh-my-fish/master/bin/install > install
@@ -63,12 +63,11 @@ USER root
 RUN usermod --shell /usr/bin/fish shaun
 
 # Set workspace directory
-RUN mkdir -p /workspace
+RUN mkdir -p /workspace && chown shaun:shaun /workspace
-RUN chown -R shaun:shaun /workspace
+WORKDIR /workspace
 
 # Switch to non-root user
 USER shaun
-WORKDIR /home/shaun
 
 # Avoid container exit.
 CMD ["tail", "-f", "/dev/null"]

nvim/tools/docker-compose.yml

@@ -0,0 +1,9 @@
+version: "3"
+services:
+  nv:
+    container_name: nv
+    image: shaun/neovim:latest
+    user: "1000:1000"
+    restart: unless-stopped
+    volumes:
+      - ~/code:/root/workspace

tools/docker-compose.yml

@@ -1,8 +0,0 @@
-version: "3"
-services:
-  mydev:
-    container_name: mydev
-    image: gitea.setlock.net/shaun/dev-container:latest
-    restart: unless-stopped
-    volumes:
-      - /home/shaun:/workspace