Skip to content

WIP: Prepare to use the full-stack image. #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 21, 2022
Merged

WIP: Prepare to use the full-stack image. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions copier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
18 changes: 2 additions & 16 deletions template/{{hostname}}/modules/aiidalab/values.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -37,7 +31,7 @@ singleuser:
cpu:
limit: 2.0
guarantee: .5
startTimeout: 600
startTimeout: 120

hub:
config:
Expand Down Expand Up @@ -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")

Expand Down