Merge pull request #524 from deNBI/fix/custom_docker_group_id

Fix/custom docker group
deNBI · Jan 24, 2025 · ec06507 · ec06507
2 parents 874b610 + 2df709f
commit ec06507
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 15 deletions.
diff --git a/cluster/roles/common/tasks/001-apt.yml b/cluster/roles/common/tasks/001-apt.yml
@@ -96,16 +96,6 @@
     state: present
   when: mode == "openstack"
 
-- name: Add Docker repository key
-  ansible.builtin.apt_key:
-    url: 'https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg'
-    state: present
-
-- name: Add Docker repository
-  ansible.builtin.apt_repository:
-    repo: 'deb https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_lsb.codename }} stable'
-    state: present
-
 - name: Add apt.bi.denbi.de repository key
   ansible.builtin.apt_key:
     url: https://apt.bi.denbi.de/repo_key.key

diff --git a/generic/generic_vars.yml b/generic/generic_vars.yml
@@ -0,0 +1,3 @@
+---
+# Won't be used anywhere, just for triggering renovate and update process
+SIMPLEVM_METADATA_VERSION: 1.8.0
diff --git a/generic/install_metadata_service.yml b/generic/install_metadata_service.yml
@@ -18,5 +18,5 @@
 
 - name: Install SimpleVM Metadata Service
   ansible.builtin.apt:
-    name: simplevm-metadata-service
+    name: "simplevm-metadata-service"
     state: present
diff --git a/generic/setup_docker.yml b/generic/setup_docker.yml
@@ -58,6 +58,7 @@
   ansible.builtin.group:
     name: docker
     state: present
+    gid: 1200
 
 - name: Add user to Docker group
   ansible.builtin.user:

diff --git a/renovate.json b/renovate.json
@@ -1,11 +1,12 @@
 {
   "extends": [
-    "config:base",
+    "config:recommended",
     ":automergePatch"
   ],
   "platform": "github",
-  "regexManagers": [
+  "customManagers": [
     {
+      "customType": "regex",
       "fileMatch": [
         "guacamole/roles/guacamole/vars/main\\.yml",
         "guacamole/guacamole_metadata\\.yml"
@@ -18,6 +19,18 @@
       "datasourceTemplate": "github-tags"
     },
     {
+      "customType": "regex",
+      "fileMatch": [
+        "generic/generic_vars\\.yml"
+      ],
+      "matchStrings": [
+        "SIMPLEVM_METADATA_VERSION: (?<currentValue>.*?)\\n"
+      ],
+      "depNameTemplate": "SimpleVM/metadata-service-roles",
+      "datasourceTemplate": "github-tags"
+    },
+    {
+      "customType": "regex",
       "fileMatch": [
         "rstudio/rstudio_vars_file\\.yml",
         "rstudio/rstudio_metadata\\.yml"
@@ -31,6 +44,7 @@
       "versioningTemplate": "regex:v(?<major>20\\d\\d)\\.(?<minor>\\d\\d)\\.(?<patch>\\d)\\+\\d*"
     },
     {
+      "customType": "regex",
       "fileMatch": [
         "vscode/vscode_vars_file\\.yml",
         "vscode/vscode_metadata\\.yml",
@@ -44,6 +58,7 @@
       "datasourceTemplate": "github-tags"
     },
     {
+      "customType": "regex",
       "fileMatch": [
         "jupyterlab/jupyterlab_env\\.yml"
       ],

diff --git a/vscode/docker.yml b/vscode/docker.yml
@@ -58,6 +58,7 @@
   ansible.builtin.group:
     name: docker
     state: present
+    gid: 1200
 
 - name: Add user to Docker group
   ansible.builtin.user:

diff --git a/vscode/vscode.yml b/vscode/vscode.yml
@@ -36,8 +36,6 @@
     state: started
     enabled: true
 
-- name: Include docker tasks
-  ansible.builtin.import_tasks: docker.yml
 
 - name: Include cwl tasks
   ansible.builtin.import_tasks: cwl.yml