Skip to content

Commit

Permalink
version 2.0.0 of frontend and backend are used
Browse files Browse the repository at this point in the history
  • Loading branch information
mnafshin committed May 14, 2020
1 parent fe8aa52 commit 984fe9b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 10 deletions.
6 changes: 3 additions & 3 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM maven:3-jdk-8 AS builder
RUN wget https://github.com/projekt-opal/opal-webservices/archive/1.0.0.tar.gz \
&& tar -xzf 1.0.0.tar.gz
WORKDIR opal-webservices-1.0.0
RUN wget https://github.com/projekt-opal/web-service/archive/2.0.0.tar.gz \
&& tar -xzf 2.0.0.tar.gz
WORKDIR web-service-2.0.0
RUN mvn clean package \
&& mv target/webservice-*.jar /webservice.jar

Expand Down
11 changes: 7 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ services:
container_name: frontend
ports:
- 3000:3000
build: frontend/
build:
context: frontend/
args:
BACKEND_ADDRESS: ${BACKEND_ADDRESS}
volumes:
- modules:/usr/src/app/node_modules
- next:/usr/src/app/.next
Expand All @@ -15,9 +18,9 @@ services:
ports:
- 8081:8081
environment:
- OPAL_TRIPLESTORE_URL=${OPAL_TRIPLESTORE_URL}
- OPAL_TRIPLESTORE_USERNAME=${OPAL_TRIPLESTORE_USERNAME}
- OPAL_TRIPLESTORE_PASSWORD=${OPAL_TRIPLESTORE_PASSWORD}
- ES_INDEX=${ES_INDEX}
- OPAL_ELASTICSEARCH_URL=${OPAL_ELASTICSEARCH_URL}
- OPAL_ELASTICSEARCH_PORT=${OPAL_ELASTICSEARCH_PORT}

volumes:
modules:
Expand Down
7 changes: 4 additions & 3 deletions frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
FROM node:13.3.0


RUN wget https://github.com/projekt-opal/web-ui/archive/1.0.0.tar.gz && \
tar -xzf 1.0.0.tar.gz
RUN wget https://github.com/projekt-opal/web-ui/archive/2.0.0.tar.gz && \
tar -xzf 2.0.0.tar.gz

# Setting working directory. All the path will be relative to WORKDIR
WORKDIR web-ui-1.0.0
WORKDIR web-ui-2.0.0

ARG BACKEND_ADDRESS

#set the backend address
RUN sed -i 's@^ baseURL:.*@ baseURL:'\'"$BACKEND_ADDRESS"\''@' webservice/axios-dataSets.js
Expand Down

0 comments on commit 984fe9b

Please sign in to comment.