vz/azbyka: last docker fixes

vz/azbyka/base.task.sample

@@ -16,6 +16,11 @@ PHP_max_file_uploads=200
 
 NGINXIP=192.168.3.254
 
+# for hosts
+MEMCACHEDHOST=x.x.x.x
+MYSQLHOST=x.x.x.x
+SPHINXHOST=x.x.x.x
+
 # Original container (with source apache configs)
 #VEIDORIG=193
 

vz/azbyka/createbytask.int.sh

@@ -69,6 +69,11 @@ EOF
 
 tune_hosts_azbyka_a05()
 {
+# HACK (TODO: move to Dockerfile)
+mkdir -p /var/lock/subsys/
+rm -rfv /var/run
+ln -s /run /var/run
+
 cat <<EOF >/etc/hosts.tmpCB
 127.0.0.1 localhost.localdomain localhost
 
@@ -76,15 +81,17 @@ cat <<EOF >/etc/hosts.tmpCB
 $VEIP $AUSER.site.azbyka.ru $AUSER
 
 # Azbyka's hosts
-136.243.107.44	sphinx.azbyka
-172.20.0.3	memcached.azbyka
-172.20.0.3	redis.azbyka
-138.201.53.216	mysql.azbyka
-138.201.53.216	mysql
-138.201.53.216	mysql.$AUSER
-138.201.53.216	mariadb.azbyka
-138.201.53.216	mariadb
-138.201.53.216	mariadb.$AUSER
+$SPHINXHOST	sphinx.azbyka
+$MEMCACHEDHOST	memcached.azbyka
+$MEMCACHEDHOST	memcached
+$MEMCACHEDHOST	redis.azbyka
+$MEMCACHEDHOST	redis
+$MYSQLHOST	mysql.azbyka
+$MYSQLHOST	mysql
+$MYSQLHOST	mysql.$AUSER
+$MYSQLHOST	mariadb.azbyka
+$MYSQLHOST	mariadb
+$MYSQLHOST	mariadb.$AUSER
 EOF
     rewrite_if_changed /etc/hosts.tmpCB /etc/hosts && update_chrooted conf
 }

vz/azbyka/createbytask.sh

@@ -79,7 +79,13 @@ assure $NAME
 assure $VEID
 #assure $VEIDORIG
 
+[ -n "$HOSTHOME" ] || HOSTHOME=/$BASENAME
+
+# TODO
+# links:
+#    - memcached
 # TODO: do via docker compose
+# TODO: user Dockerfile
 if [ -n "$DOCKID" ] ; then
     mkdir -p composers/$AUSER/
 cat <<EOF > composers/$AUSER/docker-compose.yml
@@ -93,10 +99,15 @@ services:
       - /sbin/systemd
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup
-      - /azbyka/$AUSER:/home/$AUSER
+      - $HOSTHOME/$AUSER:/home/$AUSER
     cap_add:
       - SYS_ADMIN
-
+    networks:
+      - azbyka_biblia_default
+networks:
+  azbyka_biblia_default:
+    external:
+      name: azbyka_biblia_default
 EOF
     cd composers/$AUSER
     docker-compose create || fatal
@@ -115,9 +126,9 @@ cat > /etc/vz/conf/$VEID.mount <<EOF
 #!/bin/bash
 export VEID=\$(basename \$0 .mount)
 . /etc/vz/vz.conf
-#mount --bind /azbyka /var/lib/vz/root/\$VEID/home
+#mount --bind $HOSTHOME /var/lib/vz/root/\$VEID/home
 mkdir -p /var/lib/vz/root/\$VEID/home/$AUSER/
-mount --bind /azbyka/$AUSER/ /var/lib/vz/root/\$VEID/home/$AUSER/
+mount --bind $HOSTHOME/$AUSER/ /var/lib/vz/root/\$VEID/home/$AUSER/
 $MOUNTCMD
 EOF
 chmod 0755 /etc/vz/conf/$VEID.mount
@@ -195,11 +206,11 @@ if false && [ -n "$VEIDORIG" ] ; then
 fi
 
 if true ; then
-    auserid="$(stat -c "%u" /azbyka/$AUSER/.bashrc)"
+    auserid="$(stat -c "%u" $HOSTHOME/$AUSER/.bashrc)"
     [ -n "$auserid" ] || fatal "can't get user id"
     echo "AUSERID=$auserid" | st tee -a $ATASK
 
-    agroupid="$(stat -c "%g" /azbyka/$AUSER/.bashrc)"
+    agroupid="$(stat -c "%g" $HOSTHOME/$AUSER/.bashrc)"
     [ -n "$agroupid" ] || fatal "can't get group id"
     echo "AGROUPID=$agroupid" | st tee -a $ATASK
 fi