Fix certs directory in WMAgent CouchDB image as well (#1486)

* Fix certs directory in WMAgent CouchDB image as well Remove certs from MariaDB dockerfile * Update WMAgent README
dmwm · May 22, 2024 · 874876a · 874876a
1 parent dabc9cd
commit 874876a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/docker/pypi/wmagent-couchdb/couchdb-docker-run.sh b/docker/pypi/wmagent-couchdb/couchdb-docker-run.sh
@@ -73,7 +73,6 @@ groupEntry=$(getent group $thisGroup)
     echo $groupEntry >> $HOST_MOUNT_DIR/admin/etc/group
 }
 
-[[ -d $HOST_MOUNT_DIR/certs ]] || mkdir -p $HOST_MOUNT_DIR/certs || exit $?
 [[ -d $HOST_MOUNT_DIR/admin/couchdb ]] || mkdir -p $HOST_MOUNT_DIR/admin/couchdb || exit $?
 [[ -d $HOST_MOUNT_DIR/srv/couchdb/$COUCH_TAG/config  ]] || mkdir -p $HOST_MOUNT_DIR/srv/couchdb/$COUCH_TAG/config  || exit $?
 [[ -d $HOST_MOUNT_DIR/srv/couchdb/$COUCH_TAG/install ]] || mkdir -p $HOST_MOUNT_DIR/srv/couchdb/$COUCH_TAG/install || exit $?
@@ -89,7 +88,7 @@ dockerOpts="
 --user $(id -u):$(id -g) \
 --name=couchdb \
 --mount type=bind,source=/tmp,target=/tmp \
---mount type=bind,source=$HOST_MOUNT_DIR/certs,target=/data/certs \
+--mount type=bind,source=/data/certs,target=/data/certs \
 --mount type=bind,source=$HOST_MOUNT_DIR/srv/couchdb/$COUCH_TAG/install,target=/data/srv/couchdb/current/install \
 --mount type=bind,source=$HOST_MOUNT_DIR/srv/couchdb/$COUCH_TAG/logs,target=/data/srv/couchdb/current/logs \
 --mount type=bind,source=$HOST_MOUNT_DIR/srv/couchdb/$COUCH_TAG/state,target=/data/srv/couchdb/current/state \

diff --git a/docker/pypi/wmagent-mariadb/Dockerfile b/docker/pypi/wmagent-mariadb/Dockerfile
@@ -15,7 +15,6 @@ ENV MDB_ROOT_DIR=/data
 ENV MDB_BASE_DIR=$MDB_ROOT_DIR/srv/mariadb
 ENV MDB_ADMIN_DIR=$MDB_ROOT_DIR/admin/mariadb
 ENV WMA_ADMIN_DIR=$MDB_ROOT_DIR/admin/wmagent
-ENV MDB_CERTS_DIR=$MDB_ROOT_DIR/certs
 
 ENV MDB_CURRENT_DIR=$MDB_BASE_DIR/$MDB_TAG
 ENV MDB_MANAGE_DIR=$MDB_CURRENT_DIR

diff --git a/docker/pypi/wmagent-mariadb/mariadb-docker-run.sh b/docker/pypi/wmagent-mariadb/mariadb-docker-run.sh
@@ -73,7 +73,6 @@ groupEntry=$(getent group $thisGroup)
     echo $groupEntry >> $HOST_MOUNT_DIR/admin/etc/group
 }
 
-[[ -d $HOST_MOUNT_DIR/certs ]] || (mkdir -p $HOST_MOUNT_DIR/certs) || exit $?
 [[ -d $HOST_MOUNT_DIR/admin/mariadb ]] || (mkdir -p $HOST_MOUNT_DIR/admin/mariadb) || exit $?
 # [[ -d $HOST_MOUNT_DIR/srv/mariadb/$MDB_TAG/config  ]] || (mkdir -p $HOST_MOUNT_DIR/srv/mariadb/$MDB_TAG/config)  || exit $?
 [[ -d $HOST_MOUNT_DIR/srv/mariadb/$MDB_TAG/install/database ]] || { mkdir -p $HOST_MOUNT_DIR/srv/mariadb/$MDB_TAG/install/database ;} || exit $?
@@ -88,7 +87,6 @@ dockerOpts="
 --user $(id -u):$(id -g) \
 --name=mariadb \
 --mount type=bind,source=/tmp,target=/tmp \
---mount type=bind,source=$HOST_MOUNT_DIR/certs,target=/data/certs \
 --mount type=bind,source=$HOST_MOUNT_DIR/srv/mariadb/$MDB_TAG/install/database,target=/data/srv/mariadb/current/install/database \
 --mount type=bind,source=$HOST_MOUNT_DIR/srv/mariadb/$MDB_TAG/logs,target=/data/srv/mariadb/current/logs \
 --mount type=bind,source=$HOST_MOUNT_DIR/admin/mariadb,target=/data/admin/mariadb/ \

diff --git a/docker/pypi/wmagent/README.md b/docker/pypi/wmagent/README.md
@@ -88,7 +88,7 @@ Single host Mount area:
 * /data/dockerMount/
 
 List of host mounts:
-* /data/dockerMount/certs
+* /data/certs
 * /etc/condor (schedd runs on the host, not the container)
 * /etc/tnsnames.ora  (for agents using Oracle database)
 * /tmp
@@ -149,7 +149,7 @@ Docker container has been initialized! However you still need to:
        manage start-agent
 
      * From the host:
-       docker kill wmagent
+       docker stop wmagent
        ./wmagent-docker-run.sh -t <WMA_TAG> &
 Have a nice day!
 
@@ -313,11 +313,11 @@ They are set at different moments along the process: i.e. at `buildtime` - when
 * **List of variables set at `runtime` by sourcing `$WMA_ENV_FILE`:**
 
    * WMAGENT_SECRETS_LOCATION=$WMA_ROOT_DIR/admin/wmagent/WMAgent.secrets
-   * X509_HOST_CERT=$WMA_ROOT_DIR/certs/servicecert.pem
-   * X509_HOST_KEY=$WMA_ROOT_DIR/certs/servicekey.pem
-   * X509_USER_CERT=$WMA_ROOT_DIR/certs/servicecert.pem
-   * X509_USER_KEY=$WMA_ROOT_DIR/certs/servicekey.pem
-   * X509_USER_PROXY=$WMA_ROOT_DIR/certs/myproxy.pem
+   * X509_HOST_CERT=$WMA_CERTS_DIR/servicecert.pem
+   * X509_HOST_KEY=$WMA_CERTS_DIR/servicekey.pem
+   * X509_USER_CERT=$WMA_CERTS_DIR/servicecert.pem
+   * X509_USER_KEY=$WMA_CERTS_DIR/servicekey.pem
+   * X509_USER_PROXY=$WMA_CERTS_DIR/myproxy.pem
    * install=$WMA_INSTALL_DIR
    * config=$WMA_CONFIG_DIR
    * manage=$WMA_MANAGE_DIR/manage

diff --git a/docker/pypi/wmagent/wmagent-docker-run.sh b/docker/pypi/wmagent/wmagent-docker-run.sh
@@ -72,7 +72,6 @@ if ! [ -f $HOST_MOUNT_DIR/admin/etc/group ]; then
 fi
 
 # create regular mount points at runtime
-[[ -d $HOST_MOUNT_DIR/certs ]] || (mkdir -p $HOST_MOUNT_DIR/certs) || exit $?
 [[ -d $HOST_MOUNT_DIR/admin/wmagent ]] || (mkdir -p $HOST_MOUNT_DIR/admin/wmagent) || exit $?
 [[ -d $HOST_MOUNT_DIR/srv/wmagent/$WMA_TAG/install ]] || (mkdir -p $HOST_MOUNT_DIR/srv/wmagent/$WMA_TAG/install) || exit $?
 [[ -d $HOST_MOUNT_DIR/srv/wmagent/$WMA_TAG/config  ]] || (mkdir -p $HOST_MOUNT_DIR/srv/wmagent/$WMA_TAG/config)  || exit $?