Merge pull request #46 from bridgedb/bridgedb/ws/2.1.6

Updates for BridgeDb Webservice 2.1.6

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "swagger-ui"]
-	path = swagger-ui
-	url = https://github.com/swagger-api/swagger-ui.git

Dockerfile

@@ -5,7 +5,6 @@ MAINTAINER BiGCaT
 ENV PORT 8080
 
 RUN apt-get update
-RUN apt-get install apache2 -y
 RUN apt-get install jq -y
 
 COPY setup.sh /
@@ -19,28 +18,7 @@ RUN /setup.sh
 COPY startup.sh /opt/bridgedb/bridgedb/
 RUN chmod +x /opt/bridgedb/bridgedb/startup.sh
 
-COPY ports.conf /etc/apache2
-COPY 000-default.conf /etc/apache2/sites-enabled/
-
-RUN a2enmod proxy \
-&& a2enmod proxy_http \
-&& a2enmod ssl \
-&& a2enmod rewrite \
-&& service apache2 stop
-
-COPY ports.conf /etc/apache2
-COPY 000-default.conf /etc/apache2/sites-enabled/
-
-#improve with configuration change instead of copy
-#CMD sed -i "s/80/$PORT/g" /etc/apache2/sites-available/000-default.conf
-#CMD sed -i "s/80/$PORT/g" /etc/apache2/ports.conf 
-
-RUN mkdir /var/www/html/swagger/
-COPY v3/ /var/www/html/swagger/
-COPY index.html /var/www/html/swagger/
-COPY bridgedb.png /var/www/html/swagger/
-
 EXPOSE 8183 8080
 
-ENTRYPOINT service apache2 start && /opt/bridgedb/bridgedb/startup.sh -f /opt/bridgedb-databases/gdb.config
+ENTRYPOINT /opt/bridgedb/bridgedb/startup.sh -f /opt/bridgedb-databases/gdb.config
 CMD ["-D", "FOREGROUND"]

setup.sh

@@ -9,7 +9,7 @@
 #This line is updated at every run of https://github.com/bridgedb/docker/blob/master/.github/workflows/buildandpush.yml substituting the
 #bridgedbwsversion with the one declared in the bridgedbwservice pom (https://raw.githubusercontent.com/bridgedb/BridgeDbWebservice/main/pom.xml).
 #The changes are NOT committed and pushed, but are effective when running setup.sh in the action.
-export BRIDGEDBWSVERSION="2.1.4"
+export BRIDGEDBWSVERSION="2.1.6"
 
 cd /opt/
 mkdir -p bridgedb/bridgedb/

startup.sh

@@ -9,8 +9,4 @@ cd $(dirname $0)
 # change to directory of this script
 
 pwd
-apt install nmap -y
-nmap localhost
-
-sed -i "s|SERVER_URL|$SERVER_URL|" /var/www/html/swagger/swagger.json
-java -jar BridgeDb-Webservice.jar 8183 > bridgedb.log
+java -jar BridgeDb-Webservice.jar 8183 true $SERVER_URL > bridgedb.log