diff --git a/Workbench/grouper_data/Dockerfile b/Workbench/grouper_data/Dockerfile index 7ccbf7c..56d49be 100644 --- a/Workbench/grouper_data/Dockerfile +++ b/Workbench/grouper_data/Dockerfile @@ -8,7 +8,7 @@ RUN yum install -y epel-release \ && yum clean all \ && rm -rf /var/cache/yum -COPY container_files/conf/ /opt/grouper/grouper.apiBinary/conf/ +COPY container_files/conf/ /opt/grouper/grouperWebapp/WEB-INF/classes/ RUN ln -s /usr/bin/resolveip /usr/libexec/resolveip @@ -29,7 +29,7 @@ RUN mysql_install_db \ RUN (mysqld_safe & ) \ && while ! curl -s localhost:3306 > /dev/null; do echo waiting for mysqld to start; sleep 1; done; \ - bin/gsh -registry -check -runscript -noprompt + /opt/grouper/grouperWebapp/WEB-INF/bin/gsh.sh -registry -check -runscript -noprompt EXPOSE 3306 diff --git a/Workbench/wordpress_server/Dockerfile b/Workbench/wordpress_server/Dockerfile index 2205d6e..67f25b9 100644 --- a/Workbench/wordpress_server/Dockerfile +++ b/Workbench/wordpress_server/Dockerfile @@ -44,6 +44,14 @@ WORKDIR /var/www/html # && sed -i "s/define( 'DB_COLLATE', '' );/define( 'DB_COLLATE', '' );\ndefine('JWT_AUTH_SECRET_KEY', 'your-top-secret-key');\ndefine('JWT_AUTH_CORS_ENABLE', true);\n/" /var/www/html/wp-config.php \ # && sed -i "s/RewriteBase \//RewriteBase \/\nRewriteRule \^wp-json\/\(\.\*\) \/?rest_route=\/\$1 \[L\]\n/" /var/www/html/.htaccess -ln -sf /run/secrets/shib_sp-key.pem /etc/shibboleth/sp-key.pem +RUN ln -sf /run/secrets/shib_sp-key.pem /etc/shibboleth/sp-key.pem RUN chown -R apache:apache /var/www/html +COPY container_files/system/setservername.sh /usr/local/bin/ +RUN chmod 755 /usr/local/bin/setservername.sh && rm -f /etc/httpd/conf.d/ssl.conf + +#set hostname RUN /usr/local/bin/setservername.sh + + +ENV LD_LIBRARY_PATH=/opt/shibboleth/lib64 +