Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ COPY entrypoint.sh /usr/

EXPOSE 8181

RUN chmod +x /usr/entrypoint.sh
RUN mkdir -p /usr/target
RUN chmod +x /usr/entrypoint.sh && sed -i 's/\r$//' /usr/entrypoint.sh

ENTRYPOINT [ "/usr/entrypoint.sh" ]
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
ports:
- "5436:5436"
volumes:
- $HOME/medplat-temp/data:/var/lib/postgresql/data
- ./medplat-temp/data:/var/lib/postgresql/data
- ./db_init.sh:/docker-entrypoint-initdb.d/db_init.sh
networks:
- medplat_net
Expand All @@ -25,7 +25,7 @@ services:
volumes:
- ./medplat-ui:/usr/ui/medplat-ui
- ./medplat-web/:/usr/web
- $HOME/medplat-temp/.m2:/root/.m2
- ./medplat-temp/.m2:/root/.m2
networks:
- medplat_net

Expand Down
8 changes: 6 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
#!/bin/bash

# Fix any potential CRLF from the start
sed -i 's/\r$//' /usr/entrypoint.sh

cd /usr/ui/medplat-ui

npm install --legacy-peer-deps
Expand All @@ -8,6 +11,7 @@ bower install
cd /usr/web
mvn clean install -P docker -Dmaven.test.skip=true

mv /usr/web/target /usr/target/
mkdir -p /usr/target/
cp /usr/web/target/medplat-web-2.0.jar /usr/target/
cd /usr/target/
java -jar medplat-web-2.0.jar
java -jar medplat-web-2.0.jar