From a61effdf2fb1b1950cd7468623e7328e9974a51c Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 16:03:34 -0300 Subject: [PATCH 1/3] added link to registry --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1b81d59..97a1b90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ VOLUME /opt/shibboleth/ssl/ VOLUME /opt/httpd/ssl/ #Add httpd and php configuration -RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf && ln -s /opt/etc/httpd/conf.d/handlers.conf /etc/httpd/conf.d/handlers.conf && ln -s /opt/etc/httpd/conf.d/virtual_host_80.conf /etc/httpd/conf.d/00-comanage-80.conf && ln -s /opt/etc/php/EmailSheel.php /opt/comanage/comanage-registry-$version/app/Console/Command/EmailSheel.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/local/Config/database.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/local/Config/email.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/app/Config/email.php +RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf && ln -s /opt/etc/httpd/conf.d/handlers.conf /etc/httpd/conf.d/handlers.conf && ln -s /opt/etc/httpd/conf.d/virtual_host_80.conf /etc/httpd/conf.d/00-comanage-80.conf && ln -s /opt/etc/php/EmailSheel.php /opt/comanage/comanage-registry-$version/app/Console/Command/EmailSheel.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/local/Config/database.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/local/Config/email.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry # Port EXPOSE 80 443 From e04bdbda3228e772408f77bd6d8af73eb739321d Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 16:18:14 -0300 Subject: [PATCH 2/3] Added simple httpd.conf and link to registry --- Dockerfile | 2 +- container_files/etc/httpd/conf/httpd.conf | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 container_files/etc/httpd/conf/httpd.conf diff --git a/Dockerfile b/Dockerfile index 97a1b90..db35b60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,7 +99,7 @@ VOLUME /opt/shibboleth/ssl/ VOLUME /opt/httpd/ssl/ #Add httpd and php configuration -RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf && ln -s /opt/etc/httpd/conf.d/handlers.conf /etc/httpd/conf.d/handlers.conf && ln -s /opt/etc/httpd/conf.d/virtual_host_80.conf /etc/httpd/conf.d/00-comanage-80.conf && ln -s /opt/etc/php/EmailSheel.php /opt/comanage/comanage-registry-$version/app/Console/Command/EmailSheel.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/local/Config/database.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/local/Config/email.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry +RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf && ln -s /opt/etc/httpd/conf.d/handlers.conf /etc/httpd/conf.d/handlers.conf && ln -s /opt/etc/httpd/conf.d/virtual_host_80.conf /etc/httpd/conf.d/00-comanage-80.conf && ln -s /opt/etc/php/EmailSheel.php /opt/comanage/comanage-registry-$version/app/Console/Command/EmailSheel.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/local/Config/database.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/local/Config/email.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry && rm /etc/httpd/conf/httpd.conf && ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf # Port EXPOSE 80 443 diff --git a/container_files/etc/httpd/conf/httpd.conf b/container_files/etc/httpd/conf/httpd.conf new file mode 100644 index 0000000..f6d8cf1 --- /dev/null +++ b/container_files/etc/httpd/conf/httpd.conf @@ -0,0 +1,12 @@ +ServerRoot "/etc/httpd" +Include conf.modules.d/*.conf +User apache +Group apache +ServerAdmin root@localhost +AddDefaultCharset UTF-8 +TypesConfig /etc/mime.types +AddType application/x-compress .Z +AddType application/x-gzip .gz .tgz +AddType text/html .shtml +AddOutputFilter INCLUDES .shtml +IncludeOptional conf.d/*.conf From bd783376c58cae435e267548b8668b4e11f1d7b1 Mon Sep 17 00:00:00 2001 From: villadalmine Date: Fri, 16 Sep 2016 16:20:03 -0300 Subject: [PATCH 3/3] Added httpd.conf --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index db35b60..9d7e281 100644 --- a/Dockerfile +++ b/Dockerfile @@ -100,7 +100,7 @@ VOLUME /opt/httpd/ssl/ #Add httpd and php configuration RUN ln -s /opt/etc/httpd/conf.d/ports.conf /etc/httpd/conf.d/ports.conf && ln -s /opt/etc/httpd/conf.d/handlers.conf /etc/httpd/conf.d/handlers.conf && ln -s /opt/etc/httpd/conf.d/virtual_host_80.conf /etc/httpd/conf.d/00-comanage-80.conf && ln -s /opt/etc/php/EmailSheel.php /opt/comanage/comanage-registry-$version/app/Console/Command/EmailSheel.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/local/Config/database.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/database.php /opt/comanage/comanage-registry-$version/app/Config/database.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/local/Config/email.php && rm -f /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/etc/php/email.php /opt/comanage/comanage-registry-$version/app/Config/email.php && ln -s /opt/comanage/comanage-registry-1.0.5/app/webroot /var/www/html/registry && rm /etc/httpd/conf/httpd.conf && ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf - + # Port EXPOSE 80 443