Skip to content

Commit

Permalink
fix: make sure that docker compose generator also uses exposedPort (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
svrnm authored Feb 4, 2025
1 parent d0b656d commit 7289ece
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docs/quick-start/docker-compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ in a new folder:
services:
frontend:
type: java
port: 3000
exposedPort: 3000
endpoints:
http:
/upload:
Expand Down
4 changes: 3 additions & 1 deletion docs/tutorial/1-two-services.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ simulation:
- For docker compose run

```shell
docker run --rm -t -i -v ${PWD}:/mnt cisco-open/app-simulator-generators-docker-compose --config /mnt/config.yaml --output /mnt/docker-compose.yaml
docker run --rm -t -i -v ${PWD}:/mnt cisco-open/app-simulator-generators-docker-compose:latest --config /mnt/config.yaml --output /mnt/docker-compose.yaml
docker compose up
```

Expand All @@ -66,3 +66,5 @@ simulation:
docker run --rm -t -i -v ${PWD}/deployments:/app/deployments -v ${PWD}:/mnt ghcr.io/cisco-open/app-simulator-generators-k8s:latest --config /mnt/config.yaml
kubectl apply -f deployments/
```

In both cases you will be see three containers being started.
4 changes: 2 additions & 2 deletions scripts/generators/docker-compose/docker-compose.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ services:
{%- for name, details in scopeDetails.items() %}
{{ name }}:
image: {{ global.imageNamePrefix }}app-simulator-{{ scope }}-{{ details.type }}:{{global.imageVersion }}
{%- if details.port is defined %}
{%- if details.exposedPort is defined %}
ports:
- "{{ details.port }}:{{ global.defaultPorts[scope] }}"
- "{{ details.exposedPort }}:{{ global.defaultPorts[scope] }}"
{%- endif %}
{%- if global.defaultPorts is defined -%}
{%- if global.defaultPorts[scope] is defined and global.defaultPorts[scope] != global._defaultDefaultPorts[scope] %}
Expand Down

0 comments on commit 7289ece

Please sign in to comment.