|
@ -170,6 +170,7 @@ if [ -d "$Wdir/project" ]; then |
|
|
&& chown -R \${USER1}:\${USER1} \${SSHDIR} |
|
|
&& chown -R \${USER1}:\${USER1} \${SSHDIR} |
|
|
|
|
|
|
|
|
COPY .vimrc /home/docker |
|
|
COPY .vimrc /home/docker |
|
|
|
|
|
EXPOSE 3787 |
|
|
|
|
|
|
|
|
EOF |
|
|
EOF |
|
|
fi |
|
|
fi |
|
@ -252,6 +253,7 @@ if [ "$Wdir" == "$HOME" ]; then |
|
|
&& chown -R \${USER1}:\${USER1} \${SSHDIR} |
|
|
&& chown -R \${USER1}:\${USER1} \${SSHDIR} |
|
|
|
|
|
|
|
|
COPY .vimrc /home/docker |
|
|
COPY .vimrc /home/docker |
|
|
|
|
|
EXPOSE 3787 |
|
|
EOF |
|
|
EOF |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
@ -266,6 +268,7 @@ fi |
|
|
/bin/cp -f $DIR/$hostnames_get $Wdir/$hostnames_get |
|
|
/bin/cp -f $DIR/$hostnames_get $Wdir/$hostnames_get |
|
|
/bin/cp -f $DIR/ROOT_PASSWORD $Wdir/ROOT_PASSWORD |
|
|
/bin/cp -f $DIR/ROOT_PASSWORD $Wdir/ROOT_PASSWORD |
|
|
/bin/cp -rf $DIR/.vimrc $Wdir/.vimrc |
|
|
/bin/cp -rf $DIR/.vimrc $Wdir/.vimrc |
|
|
|
|
|
/bin/cp -rf $DIR/bin $Wdir |
|
|
/bin/cp -rf $DIR/cls $Wdir |
|
|
/bin/cp -rf $DIR/cls $Wdir |
|
|
/bin/cp -rf $DIR/extrapackages $Wdir |
|
|
/bin/cp -rf $DIR/extrapackages $Wdir |
|
|
/bin/cp -rf $DIR/setup.sh $Wdir |
|
|
/bin/cp -rf $DIR/setup.sh $Wdir |
|
@ -292,8 +295,8 @@ services: |
|
|
- NET_ADMIN |
|
|
- NET_ADMIN |
|
|
user: root |
|
|
user: root |
|
|
entrypoint: ["sec_bootstrap", "role=masterservice", "sec_master_service_name=masterservice", "sec_worker_service_name=workerservice"] |
|
|
entrypoint: ["sec_bootstrap", "role=masterservice", "sec_master_service_name=masterservice", "sec_worker_service_name=workerservice"] |
|
|
#ports: |
|
|
ports: |
|
|
# - "\${R_PORT1}:80" |
|
|
- "\${R_PORT1}:3787" |
|
|
# - "\${R_PORT2}:443" |
|
|
# - "\${R_PORT2}:443" |
|
|
networks: |
|
|
networks: |
|
|
- ${HYBRID_NETWORK} |
|
|
- ${HYBRID_NETWORK} |
|
@ -303,6 +306,7 @@ services: |
|
|
- $Wdir/latex-all:/usr/local/bin/latex-all |
|
|
- $Wdir/latex-all:/usr/local/bin/latex-all |
|
|
- $Wdir/docs:/home |
|
|
- $Wdir/docs:/home |
|
|
- /tmp/.X11-unix:/tmp/.X11-unix |
|
|
- /tmp/.X11-unix:/tmp/.X11-unix |
|
|
|
|
|
- $Wdir/bin/ttyd.x86_64:/usr/bin/ttyd |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# workerservice: |
|
|
# workerservice: |
|
|