From 60499ed0854d41d5a9c96e07a608ebdb44e0bf38 Mon Sep 17 00:00:00 2001
From: jstranig <jstrani@capgemini.com>
Date: Wed, 2 Feb 2022 17:09:20 +0100
Subject: [PATCH] Unable a startup script to use maap-configmap and
s3-credential
---
build-docker-devfile-registry.sh | 4 ++--
devfiles/jupyter/devfile.yaml | 20 +++++++++++++-------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/build-docker-devfile-registry.sh b/build-docker-devfile-registry.sh
index 7bd33eb..3705d38 100755
--- a/build-docker-devfile-registry.sh
+++ b/build-docker-devfile-registry.sh
@@ -2,5 +2,5 @@ docker login -u eu-west-0@$AK -p 2a66e70323f94d692f02a0e606178fb4c3dae8989409245
docker build -t che-devfile-registry -f build/dockerfiles/Dockerfile .
#export DOCKER_ID_USER="kosted"
#login to orange cloud
-docker tag che-devfile-registry registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/che-devfile-registry:1.1.2
-docker push registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/che-devfile-registry:1.1.2
+docker tag che-devfile-registry registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/che-devfile-registry:1.3.0
+docker push registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/che-devfile-registry:1.3.0
diff --git a/devfiles/jupyter/devfile.yaml b/devfiles/jupyter/devfile.yaml
index 0b0bf77..08209b2 100644
--- a/devfiles/jupyter/devfile.yaml
+++ b/devfiles/jupyter/devfile.yaml
@@ -24,16 +24,27 @@ components:
spec:
containers:
- name: jupyter
- image: 'registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/maap-esa-jupyterlab:0.0.13'
+ image: 'registry.eu-west-0.prod-cloud-ocb.orange-business.com/cloud-biomass-maap/maap-esa-jupyterlab:0.0.14'
imagePullPolicy: IfNotPresent
+ envFrom:
+ - configMapRef:
+ name: maap-configmap
mountSources: true
resources:
limits:
memory: 2048Mi
securityContext:
privileged: true
+ volumeMounts:
+ - name: s3fs
+ mountPath: "/etc/s3fs"
+ readOnly: true
imagePullSecrets:
- name: secret-docker-bimaap
+ volumes:
+ - name: s3fs
+ secret:
+ secretName: s3-credential
type: kubernetes
volumes:
- name: projects
@@ -43,10 +54,5 @@ components:
- value: WS_JUPYTER
name: MACHINE_NAME
- value: /projects
- name: JUPYTER_NOTEBOOK_DIR
- - value: "97262f0b-d3ca-4492-bcf8-9a0e12bdede8"
- name: CLIENT_ID
- - value: "VAL"
- name: MAAP_ENV_TYPE
+ name: JUPYTER_NOTEBOOK_DIR
apiVersion: 1.0.0
-
--
GitLab