Merge branch 'main' into aryan

Author: eomielan

.devcontainer/Dockerfile

@@ -16,3 +16,7 @@ COPY --chown=${USERNAME}:${USERNAME} config ${HOME}
 #     && apt-get autoremove -y \
 #     && apt-get clean -y \
 #     && rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
+
+# set user and working directory
+USER ${USERNAME}
+WORKDIR ${ROS_WORKSPACE}

.devcontainer/base-dev/README.md

@@ -62,23 +62,9 @@ If you want to push this to GitHub (instead of using the slow Build Images workf
 
 1. Login to the GitHub container registry: [Authenticating with a personal access token (classic)](https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-with-a-personal-access-token-classic)
 
-2. Push each image, replacing `<tag>` with the desired tag in the commands below
+2. Push the image, replacing `<tag>` with the desired tag in the command below
 
     ```
-    docker buildx build . \
-        --file base-dev.Dockerfile \
-        --tag ghcr.io/ubcsailbot/sailbot_workspace/base:<tag> \
-        --platform linux/arm64,linux/amd64 \
-        --builder sailbot \
-        --target base \
-        --push
-    docker buildx build . \
-        --file base-dev.Dockerfile \
-        --tag ghcr.io/ubcsailbot/sailbot_workspace/local-base:<tag> \
-        --platform linux/arm64,linux/amd64 \
-        --builder sailbot \
-        --target local-base \
-        --push
     docker buildx build . \
         --file base-dev.Dockerfile \
         --tag ghcr.io/ubcsailbot/sailbot_workspace/dev:<tag> \

.devcontainer/docker-compose.yml

@@ -5,6 +5,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile
+    user: ros
     ports:
       # website
       - "3005:3005"
@@ -27,7 +28,7 @@ services:
 
   # URL: mongodb://localhost:27017
   mongodb:
-    image: mongo:7
+    image: mongo:${MONGO_TAG:-4.4.18}
     restart: unless-stopped
     volumes:
       - mongodb-data:/data/db:delegated

.devcontainer/website/docker-compose.website.prod.yml

@@ -8,9 +8,11 @@ services:
     volumes:
       - ../src/website:/website:cached
       - website-node-modules:/website/node_modules:delegated
+      - website-tests-node-modules:/website/tests/node_modules:delegated
 
     # Runs on the same network as the workspace container, allows "forwardPorts" in devcontainer.json function.
     network_mode: service:sailbot-workspace
 
 volumes:
   website-node-modules:
+  website-tests-node-modules:

.devcontainer/website/docker-compose.website.yml

@@ -8,9 +8,11 @@ services:
     volumes:
       - ../src/website:/website:cached
       - website-node-modules:/website/node_modules:delegated
+      - website-tests-node-modules:/website/tests/node_modules:delegated
 
     # Runs on the same network as the workspace container, allows "forwardPorts" in devcontainer.json function.
     network_mode: service:sailbot-workspace
 
 volumes:
   website-node-modules:
+  website-tests-node-modules:

.github/dependabot.yml

@@ -9,11 +9,17 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"
+  # Disable dependabot for website dependencies
   - package-ecosystem: "npm"
-    directory: "/"
+    directory: "/src/website"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 0
+  # Disable dependabot for website test dependencies
+  - package-ecosystem: "npm"
+    directory: "/src/website/tests"
     schedule:
       interval: "weekly"
-    # Disable all pull requests for npm dependencies
     open-pull-requests-limit: 0
     # # Create a group of dependencies to be updated together in one pull request
     # groups:

.github/workflows/build-images.yml

@@ -4,10 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag of the base, local-base, and dev images'
-        required: false
+        description: 'Tag of the Docker image'
+        required: true
         type: string
-        default: 'main'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -34,37 +33,15 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.PAT_TOKEN }}
 
-      - name: Build and push base
-        uses: docker/build-push-action@v5
-        with:
-          context: "{{defaultContext}}:.devcontainer/base-dev"
-          file: base-dev.Dockerfile
-          push: true
-          tags: ghcr.io/ubcsailbot/sailbot_workspace/base:${{ inputs.tag }}
-          platforms: linux/arm64,linux/amd64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          target: base
-
-      - name: Build and push local-base
-        uses: docker/build-push-action@v5
-        with:
-          context: "{{defaultContext}}:.devcontainer/base-dev"
-          file: base-dev.Dockerfile
-          push: true
-          tags: ghcr.io/ubcsailbot/sailbot_workspace/local-base:${{ inputs.tag }}
-          platforms: linux/arm64,linux/amd64
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          target: local-base
-
       - name: Build and push dev
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: "{{defaultContext}}:.devcontainer/base-dev"
           file: base-dev.Dockerfile
           push: true
-          tags: ghcr.io/ubcsailbot/sailbot_workspace/dev:${{ inputs.tag }}
+          tags: |
+            ghcr.io/ubcsailbot/sailbot_workspace/dev:${{ inputs.tag }}
+            ghcr.io/ubcsailbot/sailbot_workspace/dev:latest
           platforms: linux/arm64,linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max

.markdown-link-check.json

@@ -21,5 +21,7 @@
         {
             "pattern": "^https://linuxize.com*"
         }
-    ]
+    ],
+
+    "aliveStatusCodes": [403, 200]
 }

mkdocs.yml

@@ -6,7 +6,7 @@ site_author: UBCSailbot Software Team
 # Repository
 repo_name: UBCSailbot/sailbot_workspace
 repo_url: https://github.com/UBCSailbot/sailbot_workspace
-edit_uri: "edit/main/sailbot_workspace/"
+edit_uri: "edit/main/docs/"
 
 # Configuration
 theme:

sailbot.code-workspace

@@ -420,7 +420,7 @@
                 "label": "purge",
                 "detail": "Purge workspace by deleting all generated files.",
                 "type": "shell",
-                "command": "rm -fr build install log; py3clean .",
+                "command": "sudo rm -rf build install log; py3clean .",
                 "problemMatcher": []
             },
             // Linting and static code analysis tasks