Unverified Commit dbe07458 authored by Craig Russell's avatar Craig Russell Committed by GitHub
Browse files

Merge pull request #21 from bioimagearchive/dockerhub_v_gitlab

Dockerhub v gitlab
parents 4cf2156f 91824190
......@@ -3,11 +3,13 @@ config:
# hub_url: http://10.43.114.27
hub_url: http://45.86.170.228/binderhub/
use_registry: true
image_prefix: ctr26/binder-
# base_url: /binder
image_prefix: bioimagearchive/binder-
# build_image: "aicrowd/repo2docker"
# build_image: "aicrowd/repo2docker:latest"
# base_url: "/staging" #Doesn't work
# networkPolicy:
# enabled: true
# # Good until this:
# # Good until this:
jupyterhub:
hub:
baseUrl: /binderhub
......@@ -33,9 +35,10 @@ jupyterhub:
# - localhost
ingress:
# pathSuffix: ""
enabled: true
hosts:
- ""
- "localhost"
- ""
- "localhost"
annotations:
kubernetes.io/ingress.class: nginx
......@@ -31,7 +31,9 @@ appsTemplates:
binderhub: &binderhub
name: "binderhub"
chart: "jupyterhub/binderhub"
# version: "0.2.0-n519.hf5c1a19"
version: "0.2.0-n217.h35366ea"
# version: "0.2.0-n217.h35366ea"
# helmFlags:
# - "--debug"
# # test: true
......@@ -42,13 +44,16 @@ appsTemplates:
set:
registry.username: "$CI_REGISTRY_USER"
registry.password: "$CI_REGISTRY_PASSWORD"
registry.url: "https://dockerhub.ebi.ac.uk"
jupyterhub.hub.services.binder.apiToken: "$SECRET_JUPYTERHUB_PROXY_TOKEN"
jupyterhub.proxy.secretToken: "$SECRET_JUPYTERHUB_PROXY_TOKEN"
jupyterhub.proxy.secretToken: "$SECRET_BINDERHUB_SERVICE"
config.BinderHub.image_prefix: "$CI_REGISTRY_IMAGE"
config.GitHubRepoProvider.access_token: "$SECRET_GITHUBREPOPROVIDER"
# config.BinderHub.image_prefix: "$CI_REGISTRY_IMAGE"
config.BinderHub.image_prefix: "$CI_REGISTRY_IMAGE/binderhub-"
# config.DockerRegistry.url: "https://dockerhub.ebi.ac.uk"
config.DockerRegistry.token_url: ""
config.BinderHub.hub_url: "$HOST_NAME/binderhub/"
# hub_url: http://10.43.114.27
# config.DockerRegistry.url: "https://dockerhub.ebi.ac.uk"
# config.DockerRegistry.token_url: ""
# registry.url: "https://dockerhub.ebi.ac.uk"
jupyterhub: &jupyterhub
name: "jupyterhub"
......@@ -73,13 +78,13 @@ appsTemplates:
timeout: 120
apps:
daskgateway-staging:
<<: *dask
name: "daskgateway-staging"
group: "staging"
namespace: "daskgateway-staging"
# valuesFiles:
# - "daskgateway/staging.yaml"
# daskgateway-staging:
# <<: *dask
# name: "daskgateway-staging"
# group: "staging"
# namespace: "daskgateway-staging"
# # valuesFiles:
# # - "daskgateway/staging.yaml"
daskgateway-production:
<<: *dask
......@@ -98,11 +103,12 @@ apps:
valuesFiles:
# - "binderhub/secret.yaml"
- "binderhub/config.yaml"
# - "binderhub/secret.yaml"
# - "binderhub/staging.yaml"
# - "binderhub/ebi_dockerhub.yaml"
# set:
# registry.username: "$SECRET_DOCKERHUB_USERNAME"
# registry.password: "$SECRET_DOCKERHUB_PASSWORD"
# config.BinderHub.base_url: "staging"
# ingress.pathSuffix: "/staging"
binderhub-production:
<<: *binderhub
......@@ -115,6 +121,19 @@ apps:
# - "binderhub/staging.yaml"
# - "binderhub/ebi_dockerhub.yaml"
# - "binderhub/production.yaml"
# binderhub-production:
# <<: *binderhub
# name: "binderhub-production"
# namespace: "binderhub-production"
# group: "production"
# valuesFiles:
# - "binderhub/config.yaml"
# # - "binderhub/secret.yaml"
# # - "binderhub/staging.yaml"
# # - "binderhub/ebi_dockerhub.yaml"
# # - "binderhub/production.yaml"
jupyterhub-sandbox-staging:
<<: *jupyterhub
name: "jupyterhub-sandbox-staging"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment