Merge pull request #15 from docker/fixregistry

Fixregistry

Dockerfile

@@ -99,8 +99,8 @@ 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 && rm /etc/httpd/conf/httpd.conf && ln -s /opt/etc/httpd/conf/httpd.conf /etc/httpd/conf/httpd.conf
+  
 # Port
 EXPOSE 80 443
 

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