Merge branch 'main' into erral-allow-using-plonecli

plone · Nov 26, 2024 · 2b72429 · 2b72429
2 parents 72a2c08 + 91cd1e6
commit 2b72429
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/frontend_addon.yml b/.github/workflows/frontend_addon.yml
@@ -7,13 +7,11 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 20.x
+  NODE_VERSION: 22.x
   PYTHON_VERSION: "3.10"
 
 jobs:
-
   generation:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -34,7 +32,7 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
+          cache: "pip"
 
       # python install
       - name: Install dependencies
@@ -57,8 +55,8 @@ jobs:
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5
         with:
-          python-version: '${{ env.PYTHON_VERSION }}'
-          cache: 'pip'
+          python-version: "${{ env.PYTHON_VERSION }}"
+          cache: "pip"
 
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
@@ -6,10 +6,11 @@ on:
       - ".github/workflows/project.yml"
   workflow_dispatch:
 
-jobs:
+env:
+  NODE_VERSION: 22.x
 
+jobs:
   generation:
-
     runs-on: ubuntu-latest
 
     strategy:
@@ -30,13 +31,19 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-          cache: 'pip'
+          cache: "pip"
 
       # python install
       - name: Install dependencies
         run: |
           pip install -r requirements.txt
 
+      # Node setup
+      - name: Use Node.js ${{ env.NODE_VERSION }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+
       # Test
       - name: Run tests
         run: |

diff --git a/project/cookiecutter.json b/project/cookiecutter.json
@@ -52,7 +52,7 @@
   "__devops_traefik_stack_include_ui": "no",
   "__devops_traefik_docker_network": "{{ cookiecutter.__devops_stack_name }}_{{ cookiecutter.__devops_swarm_stack_network }}",
   "__devops_varnish_version": "7.6",
-  "__devops_db_version": "14",
+  "__devops_db_version": "14.15",
   "__devops_db_password": "{{ random_ascii_string(12) }}",
   "__backend_addon_git_initialize": "0",
   "__backend_addon_format": "1",

diff --git a/project/{{ cookiecutter.__folder_name }}/devops/.env_dist b/project/{{ cookiecutter.__folder_name }}/devops/.env_dist
@@ -3,6 +3,5 @@ DEPLOY_ENV=prod
 DEPLOY_HOST={{ cookiecutter.hostname }}
 DEPLOY_PORT=22
 DEPLOY_USER=plone
-DEPLOY_FOLDER=/srv/{{ cookiecutter.project_slug }}/data
 DOCKER_CONFIG=.docker
 STACK_NAME={{ cookiecutter.__devops_stack_name }}
diff --git a/project/{{ cookiecutter.__folder_name }}/devops/README.md b/project/{{ cookiecutter.__folder_name }}/devops/README.md
@@ -46,7 +46,6 @@ DEPLOY_ENV=prod
 DEPLOY_HOST={{ cookiecutter.hostname }}
 DEPLOY_PORT=22
 DEPLOY_USER=plone
-DEPLOY_FOLDER=/srv/{{ cookiecutter.project_slug }}/data
 DOCKER_CONFIG=.docker
 STACK_NAME={{ cookiecutter.__devops_stack_name }}
 ```

diff --git a/project/{{ cookiecutter.__folder_name }}/devops/inventory/group_vars/all/projects.yml b/project/{{ cookiecutter.__folder_name }}/devops/inventory/group_vars/all/projects.yml
@@ -1,7 +1,6 @@
 ---
 project_folders:
-  # Path to store {{ cookiecutter.hostname }} postgres data
-  - path: {{ "\"{{ lookup('ansible.builtin.env', 'DEPLOY_FOLDER', default='/srv/plone/data') }}\"" }}
+  - path: "/srv/{{ cookiecutter.project_slug }}/data"
     owner: 999
     group: 999
     mode: "0750"
diff --git a/project/{{ cookiecutter.__folder_name }}/devops/stacks/{{ cookiecutter.hostname }}.yml b/project/{{ cookiecutter.__folder_name }}/devops/stacks/{{ cookiecutter.hostname }}.yml
@@ -249,7 +249,7 @@ volumes:
   vol-site-data:
     driver_opts:
       type: none
-      device: ${DEPLOY_FOLDER:-/srv/{{ cookiecutter.project_slug }}/data}
+      device: "/srv/{{ cookiecutter.project_slug }}/data"
       o: bind
 
 networks:

diff --git a/project/{{ cookiecutter.__folder_name }}/devops/tasks/swarm/task_swarm.yml b/project/{{ cookiecutter.__folder_name }}/devops/tasks/swarm/task_swarm.yml
@@ -4,7 +4,6 @@
 
 - name: "Docker Swarm: Initial Setup"
   block:
-
     - name: "Docker Swarm: Init Swarm"
       community.docker.docker_swarm:
         state: present
@@ -17,12 +16,12 @@
   block:
     - name: "Docker Swarm: Check for public network"
       community.docker.docker_network_info:
-        name: "{{ cookiecutter.__devops_swarm_public_network }}"
+        name: "{{ swarm.public_network }}"
       register: docker_swarm_net_public
 
     - name: "Docker Swarm: Create public network"
       community.docker.docker_network:
-        name: "{{ cookiecutter.__devops_swarm_public_network }}"
+        name: "{{ swarm.public_network }}"
         internal: false
         attachable: true
         driver: overlay