Merge pull request #476 from TosiDrop/master

Release: v3.5.1

.github/dependabot.yml

@@ -0,0 +1,27 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/client"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "npm"
+    directory: "/server"
+    schedule:
+      interval: "weekly"

.github/workflows/ci-ansible.yml

@@ -9,8 +9,8 @@ jobs:
   ansible:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: ansible-community/ansible-lint-action@v6
+      - uses: actions/checkout@v4
+      - uses: ansible/ansible-lint@v24.7.0
         with:
           args: "ansible"
       - run: 'echo "VM_TOKEN=foo" > .env'

.github/workflows/ci-docker.yml

@@ -13,19 +13,19 @@ jobs:
   build-amd64:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: qemu
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - id: buildx
-        uses: docker/setup-buildx-action@v1
-      - uses: actions/cache@v3
+        uses: docker/setup-buildx-action@v3
+      - uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-${{ runner.arch }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-${{ runner.arch }}-buildx-
       - name: build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: false
@@ -43,19 +43,19 @@ jobs:
   build-arm64:
     runs-on: ["self-hosted", "ARM64"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: qemu
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
       - id: buildx
-        uses: docker/setup-buildx-action@v1
-      - uses: actions/cache@v3
+        uses: docker/setup-buildx-action@v3
+      - uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-${{ runner.arch }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-${{ runner.arch }}-buildx-
       - name: build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: false

.github/workflows/ci-js.yml

@@ -13,9 +13,9 @@ jobs:
         node-version: [18.x]
         target: [client, server]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: install node ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +69,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/publish.yml

@@ -18,18 +18,18 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: qemu
-        uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+        uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - name: login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           flavor: |
             latest=false
@@ -40,7 +40,7 @@ jobs:
             # tag the sha version unless we are a git tag
             type=sha,enable=${{ !startsWith(github.ref, 'refs/tags/v') }},priority=300,format=long,prefix=
       - id: meta-arch
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           flavor: |
             latest=false
@@ -56,7 +56,7 @@ jobs:
           echo "const version = \"${{ steps.meta.outputs.version }}\";" > client/src/version.ts
           echo "export default version;" >> client/src/version.ts
       - name: push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -87,18 +87,18 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: qemu
-        uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+        uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
       - name: login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           flavor: |
             latest=false
@@ -109,7 +109,7 @@ jobs:
             # tag the sha version unless we are a git tag
             type=sha,enable=${{ !startsWith(github.ref, 'refs/tags/v') }},priority=300,format=long,prefix=
       - id: meta-arch
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           flavor: |
             latest=false
@@ -125,7 +125,7 @@ jobs:
           echo "const version = \"${{ steps.meta.outputs.version }}\";" > client/src/version.ts
           echo "export default version;" >> client/src/version.ts
       - name: push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
@@ -157,16 +157,16 @@ jobs:
       contents: read
       packages: write
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v4
+      - uses: docker/setup-buildx-action@v3
       - name: Login
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
           flavor: |
             latest=false
@@ -192,7 +192,7 @@ jobs:
     needs: [multi-arch-manifest]
     steps:
       - run: "echo \"RELEASE_TAG=${GITHUB_REF#refs/tags/}\" >> $GITHUB_ENV"
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v7
         if: startsWith(github.ref, 'refs/tags/')
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}

ansible/local.yml

@@ -1,27 +1,28 @@
 ---
-- hosts: all
+- name: Node Playbook
+  hosts: all
   gather_facts: true
   become: true
   vars:
     manage_datadog: "{{ MANAGE_DATADOG | default('false') }}"
     manage_docker: "{{ MANAGE_DOCKER | default('true') }}"
   tasks:
-    - name: nodePlaybook | Update apt cache
-      apt:
+    - name: NodePlaybook | Update Apt Cache
+      ansible.builtin.apt:
         update_cache: true
         cache_valid_time: '{{ 60 * 60 * 24 }}'
       tags:
         - always
       when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'
 
-    - name: nodePlaybook | Include geerlingguy.docker role
-      include_role:
+    - name: NodePlaybook | Include Geerlingguy Docker Role
+      ansible.builtin.include_role:
         name: geerlingguy.docker
         apply:
           tags:
             - docker
       vars:
-        docker_apt_arch: "{{ { 'aarch64': 'arm64', 'x86_64': 'amd64' }[ansible_facts.architecture] }}"
+        docker_apt_arch: "{{ {'aarch64': 'arm64', 'x86_64': 'amd64'}[ansible_facts.architecture] }}"
         docker_compose_version: "v2.2.3"
         docker_users: "{{ DOCKER_USERS | default(['ubuntu']) }}"
         docker_daemon_options:
@@ -30,8 +31,8 @@
         - always
       when: manage_docker | bool
 
-    - name: nodePlaybook | install DataDog
-      include_role:
+    - name: NodePlaybook | Install DataDog
+      ansible.builtin.include_role:
         name: datadog.datadog
         apply:
           tags:
@@ -57,8 +58,8 @@
           tags:
             - product:tosidrop
 
-    - name: nodePlaybook | include vm_frontend role
-      include_role:
+    - name: NodePlaybook | Include VM Frontend Role
+      ansible.builtin.include_role:
         name: vm_frontend
         apply:
           tags:

ansible/requirements.yml

@@ -1,6 +1,7 @@
 # Collections
 collections:
   - name: community.general
+  - name: community.docker
 # From Galaxy
 roles:
   - src: datadog.datadog

ansible/roles/vm_frontend/defaults/main.yml

@@ -1,5 +1,5 @@
 ---
-redis_enabled: false
+vm_frontend_redis_enabled: false
 vm_frontend_version: 'master'
 vm_frontend_image: 'ghcr.io/tosidrop/vm-frontend:{{ vm_frontend_version }}'
 vm_frontend_port: 3000