Some fixes

This commit is contained in:
Willem Dantuma 2023-08-30 11:20:39 +02:00
parent 04461a34ff
commit 063ae588df
4 changed files with 21 additions and 13 deletions

View File

@ -9,15 +9,9 @@ RUN mkdir /opt/tomcat \
&& wget https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.75/bin/apache-tomcat-9.0.75.tar.gz \ && wget https://dlcdn.apache.org/tomcat/tomcat-9/v9.0.75/bin/apache-tomcat-9.0.75.tar.gz \
&& tar xvzf apache-tomcat-9.0.75.tar.gz --strip-components 1 --directory /opt/tomcat && tar xvzf apache-tomcat-9.0.75.tar.gz --strip-components 1 --directory /opt/tomcat
COPY re3gistry/dist /opt/re3gistry COPY re3gistry/dist /opt/re3gistry
COPY init.properties /opt/re3gistry/
COPY start.sh /opt/re3gistry/ COPY start.sh /opt/re3gistry/
COPY httpd-vhosts.conf /etc/apache2/conf.d/ COPY httpd-vhosts.conf /etc/apache2/conf.d/
COPY httpd.conf /etc/apache2/ COPY httpd.conf /etc/apache2/
WORKDIR /opt/re3gistry WORKDIR /opt/re3gistry
RUN sh ./init-config.sh \ RUN chmod +x start.sh
&& cp -R app/* /opt/tomcat/webapps/ \
&& cp -R webapp/public_html/* /var/www/localhost/htdocs/ \
&& chmod +x start.sh \
&& touch /opt/tomcat/webapps/re3gistry2/WEB-INF/classes/configurations_files/system.installed
ENTRYPOINT [ "/opt/re3gistry/start.sh" ] ENTRYPOINT [ "/opt/re3gistry/start.sh" ]

View File

@ -1,6 +1,8 @@
CREATE ROLE re3gistry LOGIN PASSWORD 're3gistry'
VALID UNTIL 'infinity';
CREATE DATABASE re3gistry CREATE DATABASE re3gistry
WITH WITH
OWNER = farmmaps OWNER = re3gistry
ENCODING = 'UTF8' ENCODING = 'UTF8'
LC_COLLATE = 'en_US.utf8' LC_COLLATE = 'en_US.utf8'
LC_CTYPE = 'en_US.utf8' LC_CTYPE = 'en_US.utf8'

View File

@ -3,9 +3,15 @@ dbport=5432
dbname=re3gistry dbname=re3gistry
dbuser=re3gistry dbuser=re3gistry
dbpassword=test123 dbpassword=test123
statusbaseuri=https://test-uri.eu statusbaseuri=https://localhost:8093/
solrurl=http://localhost:8983/solr/ solrurl=http://localhost:8983/solr/
smtphost=smtp.test-url.eu smtphost=smtp.sendgrid.net
applicationrooturl=http://test-url.eu/r3egistry2 smtpport=587
rsspath=/path/to/rss/file smtpauth=true
diskcachepath=/path/to/cache smtpstarttls=false
smtpuser=apikey
smtppassword=G.ZP0wtTCPSPCIHjJfDThaGg.HOGBsuBP0xoDj5cq0y0zjZNeOwhBAXoxMks8e-aIohQ
smtpsender=francisco.salas@akkerweb.nl
applicationrooturl=https://localhost:8093/r3egistry2
rsspath=/var/efsdata/re3gistry/rss
diskcachepath=/var/efsdata/re3gistry/cache

View File

@ -1,3 +1,9 @@
#!/bin/sh #!/bin/sh
ln -sf /mnt/init.properties init.properties
. ./init-config.sh
cp -R app/* /opt/tomcat/webapps/
cp -R webapp/public_html/* /var/www/localhost/htdocs/
chmod +x start.sh
#touch /opt/tomcat/webapps/re3gistry2/WEB-INF/classes/configurations_files/system.installed
/opt/tomcat/bin/catalina.sh start /opt/tomcat/bin/catalina.sh start
exec /usr/sbin/httpd -DFOREGROUND exec /usr/sbin/httpd -DFOREGROUND