Skip to content

Commit

Permalink
Updated submodules and removed microservice versions from docker-comp…
Browse files Browse the repository at this point in the history
…ose.yml
  • Loading branch information
jwomeara committed Jun 25, 2024
1 parent 14ca0ae commit fc95f9a
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion core/in-memory-accumulo
26 changes: 13 additions & 13 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ services:
- quickstart
# To run the wildfly webservice, change `--accumulo` to `--web`
command: ["datawave-bootstrap.sh", "--accumulo"]
image: datawave/quickstart-compose:7.0.1-SNAPSHOT
image: datawave/quickstart-compose
environment:
- DW_CONTAINER_HOST=quickstart
- DW_DATAWAVE_WEB_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:8787 -Duser.timezone=GMT -Dfile.encoding=UTF-8 -Djava.net.preferIPv4Stack=true
Expand Down Expand Up @@ -122,7 +122,7 @@ services:

configuration:
entrypoint: [ "java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5009","-jar","app.jar" ]
image: datawave/config-service:4.0.1-SNAPSHOT
image: datawave/config-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,native,open_actuator
Expand All @@ -146,7 +146,7 @@ services:
condition: service_started

cache:
image: datawave/hazelcast-service:4.0.1-SNAPSHOT
image: datawave/hazelcast-service
scale: 1
command:
- --spring.profiles.active=consul,compose,remoteauth
Expand Down Expand Up @@ -174,7 +174,7 @@ services:

authorization:
entrypoint: [ "java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5008","-jar","app.jar" ]
image: datawave/authorization-service:4.0.1-SNAPSHOT
image: datawave/authorization-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,mock,compose,federation
Expand Down Expand Up @@ -203,7 +203,7 @@ services:
profiles:
- accumulo
- full
image: datawave/accumulo-service:4.0.1-SNAPSHOT
image: datawave/accumulo-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth
Expand Down Expand Up @@ -236,7 +236,7 @@ services:
condition: service_healthy

audit:
image: datawave/audit-service:4.0.1-SNAPSHOT
image: datawave/audit-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth
Expand Down Expand Up @@ -270,7 +270,7 @@ services:

metrics:
entrypoint: ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5007","-jar","app.jar"]
image: datawave/query-metric-service:4.0.2-SNAPSHOT
image: datawave/query-metric-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth
Expand Down Expand Up @@ -307,7 +307,7 @@ services:
profiles:
- dictionary
- full
image: datawave/dictionary-service:4.0.1-SNAPSHOT
image: datawave/dictionary-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth
Expand Down Expand Up @@ -355,7 +355,7 @@ services:
# If you want to test cached results, set the CACHED_RESULTS environment variable to 'true'
query:
entrypoint: ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005","-jar","app.jar"]
image: datawave/query-service:1.0.1-SNAPSHOT
image: datawave/query-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth,querymessaging,metricssource,query,mrquery,cachedresults,federation
Expand Down Expand Up @@ -399,7 +399,7 @@ services:
profiles:
- full
entrypoint: ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005","-jar","app.jar"]
image: datawave/mapreduce-query-service:1.0.1-SNAPSHOT
image: datawave/mapreduce-query-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth,query,mrquery,federation
Expand Down Expand Up @@ -437,7 +437,7 @@ services:

executor-pool1:
entrypoint: ["java","-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5006","-jar","app.jar"]
image: datawave/query-executor-service:1.0.1-SNAPSHOT
image: datawave/query-executor-service
command:
- --spring.application.name=executor-pool1
- --spring.cloud.config.name=executor
Expand Down Expand Up @@ -486,7 +486,7 @@ services:
profiles:
- pool2
- full
image: datawave/query-executor-service:1.0.1-SNAPSHOT
image: datawave/query-executor-service
command:
- --spring.application.name=executor-pool2
- --spring.cloud.config.name=executor
Expand Down Expand Up @@ -533,7 +533,7 @@ services:
profiles:
- modification
- full
image: datawave/modification-service:1.0.1-SNAPSHOT
image: datawave/modification-service
command:
- --spring.output.ansi.enabled=ALWAYS
- --spring.profiles.active=consul,compose,remoteauth,query
Expand Down

0 comments on commit fc95f9a

Please sign in to comment.