From ec8659da7ace75dbd02678448387d32ce1d5b9fe Mon Sep 17 00:00:00 2001
From: Carl Simon Adorf <simon.adorf@epfl.ch>
Date: Wed, 14 Sep 2022 16:46:00 +0200
Subject: [PATCH] Use the AiiDAlab full-stack image.

---
 copier.yml                                     |  6 +++---
 .../{{hostname}}/modules/aiidalab/values.yml   | 18 ++----------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/copier.yml b/copier.yml
index 5385232..5fbf34c 100644
--- a/copier.yml
+++ b/copier.yml
@@ -86,19 +86,19 @@ secret_token:
 
 image_name:
     type: str
-    default: aiidalab/aiidalab-docker-stack
+    default: aiidalab/full-stack
     help: |
         The name of the image to use for the singleuser container.
 
 image_tag:
     type: str
-    default: 22.01.0
+    default: latest
     help: |
         The tag of the image to use for the singleuser container.
 
 aiidalab_default_apps:
     type: str
-    default: quantum-espresso
+    default:
     help: |
         The default apps to install.
 
diff --git a/template/{{hostname}}/modules/aiidalab/values.yml b/template/{{hostname}}/modules/aiidalab/values.yml
index 3c5f30f..1d1fffa 100644
--- a/template/{{hostname}}/modules/aiidalab/values.yml
+++ b/template/{{hostname}}/modules/aiidalab/values.yml
@@ -15,19 +15,13 @@ singleuser:
     name: "{{ image_name }}"
     tag: "{{ image_tag }}"
     pullPolicy: Always
-  fsGid: 1000
-  cmd: /sbin/my_my_init
-  extraEnv:
-    NB_USER: "aiida"
-    NB_UID: "1000"
-    NB_GID: "1000"
     AIIDALAB_FACTORY_RESET: "{{ aiidalab_factory_reset | default('')}}"
 {%- if aiidalab_default_apps %}
     AIIDALAB_DEFAULT_APPS: >-
       {{ aiidalab_default_apps.split() | join('\n') | indent(6) }}
 {%- endif %}
+  cmd: start-singleuser.sh
   storage:
-    homeMountPath: "/home/aiida"
     dynamic:
       storageClass: managed-premium
 
@@ -37,7 +31,7 @@ singleuser:
   cpu:
     limit: 2.0
     guarantee: .5
-  startTimeout: 600
+  startTimeout: 120
 
 hub:
   config:
@@ -77,14 +71,6 @@ hub:
 
   extraConfig:
     myConfig: |
-
-      c.KubeSpawner.http_timeout = 600
-      # phusion init system needs to run as root
-      c.KubeSpawner.uid = 0
-      # Setting the gid was needed to fix
-      # https://github.com/aiidalab/aiidalab-docker-stack/issues/20
-      c.KubeSpawner.gid = 1000
-
       # insert template path for custom login template
       c.JupyterHub.template_paths.insert(0, "/etc/jupyterhub/templates")