Merge branch 'dev' into staging

deNBI · Feb 28, 2025 · cc9c847 · cc9c847
2 parents 10bacb2 + 8e7c9bd
commit cc9c847
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/packer/requirements.txt b/packer/requirements.txt
@@ -1,5 +1,5 @@
-openstacksdk==4.0.1
-ansible==10.4.0
-python-openstackclient==7.1.3
-paramiko==3.5.0
+openstacksdk==4.3.0
+ansible==11.2.0
+python-openstackclient==7.2.1
+paramiko==3.5.1
 passlib==1.7.4 
diff --git a/packer/requirements.yml b/packer/requirements.yml
@@ -19,6 +19,6 @@ roles:
 
 collections:
   - name: openstack.cloud
-    version: 2.3.3
+    version: 2.4.1
 
   - name: community.general
diff --git a/rstudio/rstudio.yml b/rstudio/rstudio.yml
@@ -26,8 +26,6 @@
   vars:
     r_packages:
       - name: remotes
-      - name: cran4linux/rspm
-        type: github
   when: not rstudio_vars.create_only_backend
 
 - name: Install rstudio-server role
@@ -38,6 +36,9 @@
     rstudio_server_version: "{{ rstudio_vars.RSTUDIO_VERSION | replace('v', '') | replace('+', '-') }}"
   when: not rstudio_vars.create_only_backend
 
+- name: Install rspm from GitHub
+  shell: Rscript -e "remotes::install_github('cran4linux/rspm')"
+
 - name: Ensure .Rprofile file exists
   become: true
   file:

diff --git a/rstudio/rstudio_metadata.yml b/rstudio/rstudio_metadata.yml
@@ -21,4 +21,4 @@ info_url: ""
 community_driven: false
 wiki_link: "https://cloud.denbi.de/wiki/simple_vm/customization/#rstudio"
 information_for_display:
-  version: v2024.12.0+467
+  version: v2024.12.1+563
diff --git a/rstudio/rstudio_vars_file.yml b/rstudio/rstudio_vars_file.yml
@@ -5,4 +5,4 @@ rstudio_vars:
   default_user: ubuntu
   default_password: simplevm
   RSESSION_FILE_PATH: /etc/rstudio/rsession.conf
-  RSTUDIO_VERSION: v2024.12.0+467
+  RSTUDIO_VERSION: v2024.12.1+563
diff --git a/vscode/vscode_metadata.yml b/vscode/vscode_metadata.yml
@@ -18,4 +18,4 @@ wiki_link: ""
 logo_url: "https://cloud.denbi.de/static/images/vscode.png"
 info_url: ""
 information_for_display:
-  version: v4.96.4
+  version: v4.97.2
diff --git a/vscode/vscode_vars_file.yml b/vscode/vscode_vars_file.yml
@@ -1,6 +1,6 @@
 ---
 vscode_vars:
   INSTALL_SCRIPT_URL: https://code-server.dev/install.sh
-  VSCODE_VERSION: v4.96.4
+  VSCODE_VERSION: v4.97.2
   DEFAULT_USER: ubuntu
   PORT: 3000