diff --git a/docker/phis/Dockerfile b/docker/phis/Dockerfile index 032643d84634709cf472913c9cbeb44a8a75085c..35040377cd8460c88c5294f8c4d2dc42a2522492 100644 --- a/docker/phis/Dockerfile +++ b/docker/phis/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:18.04 # docker build --network=docker_frontend --network=docker_backend -t phis:latest . # docker run --network=docker_frontend --network=docker_backend --volume docker_web_data:/var/www/html \ -# --volume docker_tomcat_conf:/home/phis/tomcat/conf --volume docker_tomcat_webapps:/home/phis/tomcat/webapps -i -t phis:latest /bin/bash +# --volume docker_tomcat_conf:/tomcat/conf --volume docker_tomcat_webapps:/tomcat/webapps -i -t phis:latest /bin/bash RUN apt-get update && apt-get install -y --no-install-recommends \ python3 python3-dev python3-pip python3-setuptools git wget build-essential ssh less emacs libidn2-0 default-jdk zip unzip sudo maven @@ -44,12 +44,12 @@ RUN psql -h postgres -U phis diaphen < phis_st_dump.sql #RUN rm phis_st_dump.sql #rdf4j -RUN wget "http://mirror.switch.ch/eclipse/rdf4j/eclipse-rdf4j-2.4.0-sdk.zip" -RUN /usr/bin/unzip eclipse-rdf4j-2.4.0-sdk.zip +RUN wget -O eclipse-rdf4j-2.4.1-sdk.zip "http://www.eclipse.org/downloads/download.php?file=/rdf4j/eclipse-rdf4j-2.4.1-sdk.zip&r=1" +RUN /usr/bin/unzip eclipse-rdf4j-2.4.1-sdk.zip RUN wget "https://raw.githubusercontent.com/OpenSILEX/docs-community-dev/master/docs/oa.rdf" RUN wget "https://raw.githubusercontent.com/OpenSILEX/docs-community-dev/master/docs/oepo-1.7.owl" ADD rdf4j.sh rdf4j.sh -RUN cat rdf4j.sh | eclipse-rdf4j-2.4.0/bin/console.sh +RUN cat rdf4j.sh | eclipse-rdf4j-2.4.1/bin/console.sh # Get PHIS: RUN git clone -b 2.6 https://github.com/OpenSILEX/phis-ws.git @@ -58,13 +58,13 @@ RUN git clone -b 2.6 https://github.com/OpenSILEX/phis-webapp.git # prepare tomcat RUN wget http://apache.hippo.nl/tomcat/tomcat-9/v9.0.12/bin/apache-tomcat-9.0.12.tar.gz RUN tar zxvf apache-tomcat-9.0.12.tar.gz -RUN cd apache-tomcat-9.0.12 -RUN cp -r conf/* /home/phis/tomcat/conf -RUN cp -rf webapps /home/phis/tomcat -ADD ../tomcat/tomcat-users.xml /home/phis/tomcat/conf -ADD ../tomcat/webapps/rdf-server.war /home/phis/tomcat/webapps -ADD ../tomcat/webapps/rdf-workbench.war /home/phis/tomcat/webapps -ADD ../tomcat/config.properties /home/phis/phis-ws/phis-ws/src/main/profiles/prod +RUN mkdir -p /home/phis/tomcat +RUN cp -r /home/phis/apache-tomcat-9.0.12/conf /home/phis/tomcat +RUN cp -r /home/phis/apache-tomcat-9.0.12/webapps /home/phis/tomcat +ADD tomcat/tomcat-users.xml /home/phis/tomcat/conf +ADD tomcat/webapps/rdf-server.war /home/phis/tomcat/webapps +ADD tomcat/webapps/rdf-workbench.war /home/phis/tomcat/webapps +ADD tomcat/config.properties /home/phis/phis-ws/phis-ws/src/main/profiles/prod RUN cd /home/phis/phis-ws/phis-ws RUN mvn clean install -Pprod diff --git a/docker/tomcat/config.properties b/docker/phis/tomcat/config.properties similarity index 100% rename from docker/tomcat/config.properties rename to docker/phis/tomcat/config.properties diff --git a/docker/tomcat/tomcat-users.xml b/docker/phis/tomcat/tomcat-users.xml similarity index 100% rename from docker/tomcat/tomcat-users.xml rename to docker/phis/tomcat/tomcat-users.xml diff --git a/docker/tomcat/webapps/rdf4j-server.war b/docker/phis/tomcat/webapps/rdf4j-server.war similarity index 100% rename from docker/tomcat/webapps/rdf4j-server.war rename to docker/phis/tomcat/webapps/rdf4j-server.war diff --git a/docker/tomcat/webapps/rdf4j-workbench.war b/docker/phis/tomcat/webapps/rdf4j-workbench.war similarity index 100% rename from docker/tomcat/webapps/rdf4j-workbench.war rename to docker/phis/tomcat/webapps/rdf4j-workbench.war