Browse Source

update samba share, jupyter docker

larry 4 năm trước cách đây
mục cha
commit
6514ba6fbd

+ 14 - 6
jupyter/.env

@@ -1,12 +1,20 @@
-CONTAINER_NAME=scipy-jupyter
+CONTAINER_NAME=jupyter
 
-LOCAL_WORKING_DIR=/home/tuffy/docker/jupyter/notebooks
-PORT=8888
+#LOCAL_WORKING_DIR=/home/tuffy/docker/jupyter/notebooks
+LOCAL_WORKING_DIR=/media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03/jupyter_notebook_projects/notebooks
+PORT=8564
+#
+#
 # Provide data sets
-LOCAL_DATASETS=/home/tuffy/docker/jupyter/datasets
+#
+#
+LOCAL_DATASETS=/media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03/jupyter_notebook_projects/datasets
+#
+#
 # Provide local modules
-#LOCAL_MODULES=/home/tuffy/docker/jupyter/python_modules
-LOCAL_MODULES=/home/tuffy/projects/amapi/venv/lib/python3.8/site-packages
+#
+#
+LOCAL_MODULES=/home/laxaurus/docker/jupyter/python_projects/py_venv/lib/python3.8/site-packages
 # beautyandthebeast
 ACCESS_TOKEN=sha1:4a216e7de9eb:e566c7ebd8587f5b5c3f4ebf8cc220649751eb78
 

+ 1 - 1
jupyter/docker-compose.yml

@@ -1,7 +1,7 @@
 version:  '3'
 services:
   datascience-notebook:
-      image:    jupyter/scipy-notebook
+      image:    jupyter/scipy-notebook:python-3.8.8
       volumes:
         - ${LOCAL_WORKING_DIR}:/home/jovyan/work
         - ${LOCAL_DATASETS}:/home/jovyan/work/datasets

+ 3 - 0
jupyter/python_projects/py_venv/pyvenv.cfg

@@ -0,0 +1,3 @@
+home = /usr/bin
+include-system-site-packages = false
+version = 3.8.5

+ 3 - 2
jupyter/startnb.sh

@@ -2,7 +2,8 @@
 # source ./startnb.sh
 #
 #
-.  ~/projects/amapi/venv/bin/activate 
+#.  ~/projects/amapi/venv/bin/activate 
+. /home/laxaurus/docker/jupyter/python_projects/py_venv/bin/activate
 docker-compose up -d
-code
+#code
 

+ 2 - 0
samba/.env

@@ -1,9 +1,11 @@
 CONTAINER_NAME=samba
 DATA_ROOT=/media/luks-53d827ad-9c21-4312-ab46-f76f5ce57d03/sambafs
+DATA_WDIGITAL_ROOT=/media/luks-8819b3a5-9cc2-4f3a-8f11-f0acc38d2792/sambafs
 USER1="home360;m@c5tyb!"
 # share name must specify user home360 as guest/user/admin/writelist in order to have write access  
 # <name;/path>[;browse;readonly;guest;users;admins;writelist;comment
 SHARE1="cam360;/cam360;yes;no;no;home360;home360;home360;"
+SHARE2="cam360-wd;/cam360-wd;yes;no;no;home360;home360;home360;"
 # the next 3 lines must be enabled otherwise mi camera won't see the samba share
 NMBD=true
 USERID=1000

+ 2 - 0
samba/docker-compose.yml

@@ -11,8 +11,10 @@ services:
 #      - "445:445"
     volumes: 
       - "${DATA_ROOT}/cam360:/cam360"
+      - "${DATA_WDIGITAL_ROOT}/cam360:/cam360-wd"
     environment:
       - SHARE=${SHARE1} 
+      - SHARE2=${SHARE2} 
       - USER=${USER1}
       - NMBD=${NMBD}
       - USERID=${USERID}

+ 2 - 2
scripts/dockers_init.sh

@@ -5,8 +5,8 @@ echo "Unlock scripts is located at nextcloud directory."
 CONTAINER_ROOT="/home/laxaurus/docker"
 #
 #
-CONTAINERS_UP=( gogs sslwp ftp nu_nc squid transmission transmission-sbt transmission-gm minidlna calibre ampache prometheus guacamole mediawiki torproxy)
-CONTAINERS_DOWN=( gogs ftpd squid transmission transmission-sbt transmission-gm minidlna calibre calibre-web ampache prometheus nu_nc nu_nc_db nu_nc_redis nu_nc_onlyoffice nu_nc_clamav nu_nc_es monitoring_grafana cadvisor redis node-exporter sslwp_https-portal sslwp_web sslwp_php mwiki mwiki_mysql mwiki_parsoid mwiki_es guaca guaca_db guaca_cd torproxy) 
+CONTAINERS_UP=( samba gogs sslwp ftp nu_nc squid transmission transmission-sbt transmission-gm minidlna calibre ampache prometheus guacamole mediawiki torproxy)
+CONTAINERS_DOWN=( samba gogs ftpd squid transmission transmission-sbt transmission-gm minidlna calibre calibre-web ampache prometheus nu_nc nu_nc_db nu_nc_redis nu_nc_onlyoffice nu_nc_clamav nu_nc_es monitoring_grafana cadvisor redis node-exporter sslwp_https-portal sslwp_web sslwp_php mwiki mwiki_mysql mwiki_parsoid mwiki_es guaca guaca_db guaca_cd torproxy) 
 #CONTAINERS=( transmission-sbt transmission )
 
 

+ 20 - 0
scripts/unlock_wdigital.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+#LV_NAME1=/dev/sdc2
+LV_NAME1=8819b3a5-9cc2-4f3a-8f11-f0acc38d2792
+LUKS_MNT1=luks-8819b3a5-9cc2-4f3a-8f11-f0acc38d2792
+UNLOCK_MNT1=/media/luks-8819b3a5-9cc2-4f3a-8f11-f0acc38d2792
+#
+#
+sudo umount $UNLOCK_MNT1
+sudo cryptsetup luksClose $LUKS_MNT1
+
+#
+# open device
+echo "unlock western digital 3T disk /dev/sdc2..."
+sudo cryptsetup luksOpen UUID=$LV_NAME1 $LUKS_MNT1 
+echo "mounting ..."
+sudo mount /dev/mapper/$LUKS_MNT1 $UNLOCK_MNT1
+#sudo mount -o rw, remount /dev/mapper/$LUKS_MNT1 $UNLOCK_MNT1
+
+

+ 1 - 0
sslwp/docker-compose.yml

@@ -78,6 +78,7 @@ services:
 	        books.algometic.com->http://vorsprung.local:8783 #production,
                 syn.algometic.com->http://vorsprung.local:9081 #production,
                 git.algometic.com->http://vorsprung.local:3079 #production,
+                jupyter.algometic.com->http://vorsprung.local:8564 #production,
                 '