Refactor WMAgent initialization

docker/pypi/wmagent/Dockerfile

@@ -3,26 +3,33 @@ MAINTAINER Valentin Kuznetsov [email protected]
 
 # TAG to be passed at build time through `--build-arg TAG=<WMA_TAG>`. Default: None
 ARG TAG=None
-ENV WMA_TAG=${TAG}
+ARG WMA_TAG=$TAG
+ENV WMA_TAG=$WMA_TAG
 ENV WMA_USER=cmst1
 ENV WMA_GROUP=zh
 ENV WMA_UID=31961
 ENV WMA_GID=1399
 ENV WMA_ROOT_DIR=/data
 
+
 # Basic WMAgent directory structure passed to all scripts through env variables:
 # NOTE: Those should be static and depend only on $WMA_BASE_DIR
-ENV WMA_BASE_DIR=$WMA_ROOT_DIR/srv
+ENV WMA_BASE_DIR=$WMA_ROOT_DIR/srv/wmagent
 ENV WMA_ADMIN_DIR=$WMA_ROOT_DIR/admin/wmagent
 ENV WMA_CERTS_DIR=$WMA_ROOT_DIR/certs
 
-ENV WMA_HOSTADMIN_DIR=$WMA_ADMIN_DIR/hostadmin
-ENV WMA_CURRENT_DIR=$WMA_BASE_DIR/wmagent/current
+
+# ENV WMA_HOSTADMIN_DIR=$WMA_ADMIN_DIR/hostadmin
+ENV WMA_CURRENT_DIR=$WMA_BASE_DIR/$WMA_TAG
+ENV WMA_AUTH_DIR=$WMA_CURRENT_DIR/auth/
 ENV WMA_INSTALL_DIR=$WMA_CURRENT_DIR/install
+ENV WMA_STATE_DIR=$WMA_CURRENT_DIR/state
 ENV WMA_CONFIG_DIR=$WMA_CURRENT_DIR/config
-ENV WMA_MANAGE_DIR=$WMA_CONFIG_DIR/wmagent
+ENV WMA_MANAGE_DIR=$WMA_CONFIG_DIR
+ENV WMA_LOG_DIR=$WMA_CURRENT_DIR/logs
 ENV WMA_DEPLOY_DIR=/usr/local
 ENV WMA_ENV_FILE=$WMA_DEPLOY_DIR/deploy/env.sh
+ENV WMA_SECRETS_FILE=$WMA_ADMIN_DIR/WMAgent.secrets
 
 
 # Setting up users and previleges
@@ -44,15 +51,16 @@ ADD install.sh ${WMA_ROOT_DIR}/install.sh
 
 # Add wmagent run script
 ADD run.sh ${WMA_ROOT_DIR}/run.sh
+ADD init.sh ${WMA_ROOT_DIR}/init.sh
 
 # Install the requested WMA_TAG.
-RUN ${WMA_ROOT_DIR}/install.sh -v ${WMA_TAG}
+RUN ${WMA_ROOT_DIR}/install.sh -t ${WMA_TAG}
 RUN chown -R ${WMA_USER}:${WMA_GID} ${WMA_ROOT_DIR}
 
 # Switch to the runtime directory and user
 WORKDIR ${WMA_ROOT_DIR}
 USER ${WMA_USER}
 ENV USER=$WMA_USER
 
-# Define the entrypoint. All the run.sh paramters should be passed at runtime.
+# Define the entrypoint.
 ENTRYPOINT ["./run.sh"]