Skip to content

Commit

Permalink
Update docker-compose configuration not to crash with the ecs deploym…
Browse files Browse the repository at this point in the history
…ents (#232)
  • Loading branch information
dariuszwisniewski authored Jun 29, 2023
1 parent 170267b commit 8c0a2ac
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ application-developer.properties
.env-local
bin
data
database
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM openjdk:17-jdk
ENV TZ=Europe/Warsaw

COPY build/libs/urlopia-*.jar /
COPY build/libs/urlopia-*.jar /urlopia.jar
COPY entrypoint.sh /entrypoint.sh
RUN chmod u+rwx,g+rwx,o+rx /entrypoint.sh

Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml → docker-compose-local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ services:
image: openjdk:17-jdk
volumes:
- ./build/libs:/urlopia
- ./entrypoint.sh:/entrypoint.sh
- ./local-entrypoint.sh:/entrypoint.sh
entrypoint: ["/bin/sh", "/entrypoint.sh"]
environment:
TZ: Europe/Warsaw
Expand Down
2 changes: 1 addition & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

# shellcheck disable=SC2086
exec java -Xmx1g -jar /urlopia/urlopia-?.?.?.jar ${JAVA_ARGS}
exec java -Xmx1g -jar /urlopia.jar ${JAVA_ARGS}
4 changes: 4 additions & 0 deletions local-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash

# shellcheck disable=SC2086
exec java -Xmx1g -jar /urlopia/urlopia-?.?.?.jar ${JAVA_ARGS}
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"dependencies": {
"@emotion/react": "^11.11.0",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.11.16",
"@mui/material": "^5.13.3"
"dependencies": {},
"scripts": {
"compose:up": "docker-compose -f docker-compose-local.yml up"
}
}

0 comments on commit 8c0a2ac

Please sign in to comment.