diff --git a/jupyterhub.yml b/jupyterhub.yml index 4ec00ff..a4b7b68 100644 --- a/jupyterhub.yml +++ b/jupyterhub.yml @@ -1,27 +1,27 @@ version: "3.6" services: jupyterlab: networks: - - proxy + - proxy_jupyter image: jupyterhub:latest hostname: 'lsms-renku.epfl.ch' volumes: - jupyter_homes:/home - jupyter_config:/srv/jupyterhub - jupyter_etc:/etc - /etc/pki/tls/certs/:/etc/jupyterhub/ssl environment: VIRTUAL_HOST: lsms-renku.epfl.ch VIRTUAL_PORT: 8000 volumes: jupyter_homes: jupyter_config: jupyter_etc: networks: - proxy: + proxy_jupyter: external: true diff --git a/portainer.yml b/portainer.yml index 6a78f04..fc175c0 100644 --- a/portainer.yml +++ b/portainer.yml @@ -1,72 +1,75 @@ version: '3.9' services: nginx-proxy: image: jwilder/nginx-proxy networks: - proxy + - proxy_jupyter ports: - "80:80" - "443:443" volumes: - "/var/run/docker.sock:/tmp/docker.sock:ro" - "./vhost.d:/etc/nginx/vhost.d:ro" - /etc/pki/tls/certs/:/etc/nginx/certs configs: - source: nginx_config target: /etc/nginx/conf.d/my_proxy.conf # environment: # - HTTPS_METHOD=nohttp agent: image: portainer/agent:2.9.3 environment: # REQUIRED: Should be equal to the service name prefixed by "tasks." when # deployed inside an overlay network AGENT_CLUSTER_ADDR: tasks.agent # AGENT_PORT: 9001 # LOG_LEVEL: debug volumes: - /var/run/docker.sock:/var/run/docker.sock - /var/lib/docker/volumes:/var/lib/docker/volumes networks: - agent_network deploy: mode: global placement: constraints: [node.platform.os == linux] portainer: image: portainer/portainer-ce:2.9.3 command: -H tcp://tasks.agent:9001 --tlsskipverify volumes: - data:/data environment: - VIRTUAL_HOST=lsms-cloud.epfl.ch - VIRTUAL_PORT=9000 - VIRTUAL_PATH=/portainer/ - VIRTUAL_DEST=/ networks: - proxy - agent_network deploy: mode: replicated replicas: 1 placement: constraints: [node.role == manager] networks: proxy: external: true + proxy_jupyter: + external: true agent_network: external: true volumes: data: configs: nginx_config: external: true