Fixes helm charts jupyterlab container: use release version as image …

…tag (#935)

* Fixes jupyterlab: use release version as image tag
* build macos wheel under manylinux2014_x86_64 platform
* User of jupyter changed to graphscope

Co-authored-by: siyuan0322 <siyuan0322@gmail.com>

charts/graphscope/templates/coordinator.yaml

@@ -122,7 +122,11 @@ spec:
         - "False"
     {{- if .Values.withJupyter }}
     - name: jupyter
+      {{- if .Values.jupyter.image.tag }}
       image: "{{ .Values.jupyter.image.name }}:{{ .Values.jupyter.image.tag }}"
+      {{- else }}
+      image: "{{ .Values.jupyter.image.name }}:{{ .Chart.AppVersion }}"
+      {{- end }}
       imagePullPolicy: {{ .Values.imagePullPolicy }}
       resources:
 {{ toYaml .Values.jupyter.resources | indent 8 }}

charts/graphscope/values.yaml

@@ -107,7 +107,7 @@ withJupyter: true
 jupyter:
   image:
     name: registry.cn-hongkong.aliyuncs.com/graphscope/jupyter
-    tag: latest
+    tag: ""
   resources:
     requests:
       cpu: 1.0

k8s/Makefile

@@ -108,7 +108,7 @@ graphscope-darwin-py3:
 	cd $(WORKING_DIR)/../coordinator && \
 		export WITH_EXTRA_DATA=ON && \
 		rm -fr build dist/*.whl || true && \
-		python3 setup.py bdist_wheel && \
+		python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
 		pip3 install delocate && \
 		for wheel in `ls dist/*.whl`; do delocate-wheel -w dist/wheelhouse -v $$wheel; done
 

k8s/jupyter.Dockerfile

@@ -9,15 +9,15 @@ RUN yum -y update && \
     rm -fr /var/cache/yum
 
 
-# Add the user UID:1000, GID:1000, home at /app
-RUN groupadd -r app -g 1000 && useradd -u 1000 -r -g app -m -d /app -s /sbin/nologin -c "App user" app && \
-    chmod 755 /app
+RUN useradd -m graphscope -u 1001 && \
+    echo 'graphscope ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
-RUN python3 -m pip install --upgrade pip
-RUN python3 -m pip install jupyterlab graphscope
+USER graphscope
+WORKDIR /home/graphscope
 
-RUN mkdir -p /main
+ENV PATH=${PATH}:/home/graphscope/.local/bin
 
-WORKDIR /main
+RUN python3 -m pip install --upgrade pip --user
+RUN python3 -m pip install jupyterlab graphscope --user
 
-CMD ["jupyter", "lab", "--port=8888", "--no-browser", "--ip=0.0.0.0", "--allow-root"]
+CMD ["jupyter", "lab", "--port=8888", "--no-browser", "--ip=0.0.0.0"]