Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for BridgeDb Webservice 2.1.6 #46

Merged
merged 1 commit into from
Nov 8, 2023
Merged

Updates for BridgeDb Webservice 2.1.6 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "swagger-ui"]
path = swagger-ui
url = https://github.com/swagger-api/swagger-ui.git
36 changes: 0 additions & 36 deletions 000-default.conf
View file
Open in desktop

This file was deleted.

24 changes: 1 addition & 23 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /
Expand All @@ -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"]
63 changes: 0 additions & 63 deletions index.html
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 1 addition & 5 deletions startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading