Skip to content

Commit

Permalink
Update generation of docker-compose resources.
Browse files Browse the repository at this point in the history
  • Loading branch information
holly-cummins committed Jun 9, 2023
1 parent 91e45ad commit be5d9fc
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 8 deletions.
4 changes: 2 additions & 2 deletions deploy/docker-compose/native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ services:
memory: 256M
cpus: '0.5'

ui-super-heroes:
image: quay.io/quarkus-super-heroes/ui-super-heroes:latest
ui-super-heroes-native:
image: quay.io/quarkus-super-heroes/ui-super-heroes:native-latest
container_name: ui-super-heroes
ports:
- "8080:8080"
Expand Down
6 changes: 1 addition & 5 deletions scripts/generate-docker-compose-resources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,7 @@ do
versionFilename="${kind}java${javaVersion}"
fi

if [[ "$project" == "ui-super-heroes" ]]; then
filename="app"
else
filename=$versionFilename
fi
filename=$versionFilename

create_project_output $project $filename $versionFilename
done
Expand Down
8 changes: 7 additions & 1 deletion ui-super-heroes/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,13 @@ The application can be started outside of docker compose simply with `docker run
If you want to use docker compose, from the `quarkus-super-heroes/ui-super-heroes` directory run:

```bash
docker-compose -f deploy/docker-compose/app.yml up
docker-compose -f deploy/docker-compose/java17.yml up
```

or

```bash
docker-compose -f deploy/docker-compose/native.yml up
```

If you want to stand up the entire system, [follow these instructions](../README.md#running-locally-via-docker-compose).
Expand Down
11 changes: 11 additions & 0 deletions ui-super-heroes/deploy/docker-compose/native.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: "3"
services:

ui-super-heroes-native:
image: quay.io/quarkus-super-heroes/ui-super-heroes:native-latest
container_name: ui-super-heroes
ports:
- "8080:8080"
restart: on-failure
environment:
API_BASE_URL: http://localhost:8082
9 changes: 9 additions & 0 deletions ui-super-heroes/src/main/docker-compose/native.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

ui-super-heroes-native:
image: quay.io/quarkus-super-heroes/ui-super-heroes:native-latest
container_name: ui-super-heroes
ports:
- "8080:8080"
restart: on-failure
environment:
API_BASE_URL: http://localhost:8082

0 comments on commit be5d9fc

Please sign in to comment.