From c0a3535ea3263de5648f84bba01a3c7b153c6f0f Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Thu, 28 Nov 2024 17:30:32 +0100 Subject: [PATCH 1/3] Reduce tweaking at deploy time --- docker/pypi/wmagent/install.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docker/pypi/wmagent/install.sh b/docker/pypi/wmagent/install.sh index 868d17085..5a1079f9e 100755 --- a/docker/pypi/wmagent/install.sh +++ b/docker/pypi/wmagent/install.sh @@ -130,11 +130,6 @@ tweakEnv(){ sed -i "s|install=.*|install=\$WMA_INSTALL_DIR|g" $WMA_ENV_FILE sed -i "s|config=.*|config=\$WMA_CONFIG_DIR|g" $WMA_ENV_FILE sed -i "s|manage=.*|manage=\$WMA_MANAGE_DIR/manage|g" $WMA_ENV_FILE - sed -i "s|RUCIO_HOME=.*|RUCIO_HOME=\$WMA_CONFIG_DIR|g" $WMA_ENV_FILE - - echo "Edit $WMA_DEPLOY_DIR/deploy/renew_proxy.sh script to point to \$WMA_ROOT_DIR" - sed -i "s|/data/|\$WMA_ROOT_DIR/|g" $WMA_DEPLOY_DIR/deploy/renew_proxy.sh - sed -i "s|source.*env\.sh|source \$WMA_ENV_FILE|g" $WMA_DEPLOY_DIR/deploy/renew_proxy.sh cat <> $WMA_ENV_FILE From effa8712c6425b0a5749acc49ffc11731f57fb51 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Thu, 28 Nov 2024 17:40:38 +0100 Subject: [PATCH 2/3] Add X509 variables to Dockerfile --- docker/pypi/wmagent/Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile index f9aebffd3..139d835a4 100644 --- a/docker/pypi/wmagent/Dockerfile +++ b/docker/pypi/wmagent/Dockerfile @@ -36,6 +36,13 @@ ENV WMA_MANAGE_DIR=$WMA_DEPLOY_DIR/bin ENV WMA_ENV_FILE=$WMA_DEPLOY_DIR/deploy/env.sh ENV WMA_SECRETS_FILE=$WMA_ADMIN_DIR/WMAgent.secrets ENV ORACLE_PATH=$WMA_DEPLOY_DIR/etc/oracle +ENV RUCIO_HOME=$WMA_CONFIG_DIR/rucio/ +ENV X509_HOST_CERT=$WMA_CERTS_DIR/servicecert.pem +ENV X509_HOST_KEY=$WMA_CERTS_DIR/servicekey.pem +ENV X509_USER_CERT=$WMA_CERTS_DIR/servicecert.pem +ENV X509_USER_KEY=$WMA_CERTS_DIR/servicekey.pem +ENV X509_USER_PROXY=$WMA_CERTS_DIR/myproxy.pem + # Add all deployment needed directories ADD bin $WMA_DEPLOY_DIR/bin From 7adc434fd751d25a9e7d794148ddd7614dd7d343 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Fri, 29 Nov 2024 18:29:14 +0100 Subject: [PATCH 3/3] Fix broken RUCIO_HOME path --- docker/pypi/wmagent/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/pypi/wmagent/Dockerfile b/docker/pypi/wmagent/Dockerfile index 139d835a4..dd47d5067 100644 --- a/docker/pypi/wmagent/Dockerfile +++ b/docker/pypi/wmagent/Dockerfile @@ -36,7 +36,7 @@ ENV WMA_MANAGE_DIR=$WMA_DEPLOY_DIR/bin ENV WMA_ENV_FILE=$WMA_DEPLOY_DIR/deploy/env.sh ENV WMA_SECRETS_FILE=$WMA_ADMIN_DIR/WMAgent.secrets ENV ORACLE_PATH=$WMA_DEPLOY_DIR/etc/oracle -ENV RUCIO_HOME=$WMA_CONFIG_DIR/rucio/ +ENV RUCIO_HOME=$WMA_CONFIG_DIR ENV X509_HOST_CERT=$WMA_CERTS_DIR/servicecert.pem ENV X509_HOST_KEY=$WMA_CERTS_DIR/servicekey.pem ENV X509_USER_CERT=$WMA_CERTS_DIR/servicecert.pem