Skip to content

Commit

Permalink
Compose naming guidance update
Browse files Browse the repository at this point in the history
  • Loading branch information
slominskir committed Apr 1, 2024
1 parent 79d7109 commit 6d9fd02
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ http://localhost:8080/bam
## Install
This application requires a Java 11+ JVM and standard library to run, plus a Java EE 8+ application server (developed with Wildfly).

1. Install service [dependencies](https://github.com/JeffersonLab/bam/blob/main/deps.yml)
1. Install service [dependencies](https://github.com/JeffersonLab/bam/blob/main/deps.yaml)
2. Download [Wildfly 26.1.3](https://www.wildfly.org/downloads/)
3. [Configure](https://github.com/JeffersonLab/bam#configure) Wildfly and start it
4. Download [bam.war](https://github.com/JeffersonLab/bam/releases) and deploy it to Wildfly
Expand Down Expand Up @@ -97,7 +97,7 @@ gradlew build
## Develop
In order to iterate rapidly when making changes it's often useful to run the app directly on the local workstation, perhaps leveraging an IDE. In this scenario run the service dependencies with:
```
docker compose -f deps.yml up
docker compose -f deps.yaml up
```
**Note**: The local install of Wildfly should be [configured](https://github.com/JeffersonLab/bam#configure) to proxy connections to services via localhost and therefore the environment variables should contain:
```
Expand Down
10 changes: 5 additions & 5 deletions build.yml → build.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
services:
oracle:
extends:
file: docker-compose.yml
file: compose.yaml
service: oracle

keycloak:
extends:
file: docker-compose.yml
file: compose.yaml
service: keycloak

puppet:
extends:
file: docker-compose.yml
file: compose.yaml
service: puppet

mailhog:
extends:
file: docker-compose.yml
file: compose.yaml
service: mailhog

bam:
extends:
file: docker-compose.yml
file: compose.yaml
service: bam
build:
context: .
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions docker-compose.yml → compose.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
services:
oracle:
extends:
file: deps.yml
file: deps.yaml
service: oracle

keycloak:
extends:
file: deps.yml
file: deps.yaml
service: keycloak

puppet:
extends:
file: deps.yml
file: deps.yaml
service: puppet

mailhog:
extends:
file: deps.yml
file: deps.yaml
service: mailhog

bam:
Expand Down
File renamed without changes.

0 comments on commit 6d9fd02

Please sign in to comment.