Skip to content

Commit

Permalink
Remove support for old fragment names
Browse files Browse the repository at this point in the history
  • Loading branch information
sichapman authored Jan 16, 2025
1 parent 5b4a34b commit 858d7c9
Show file tree
Hide file tree
Showing 41 changed files with 21 additions and 538 deletions.
18 changes: 3 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,6 @@ A default `compose-fragment.yml` is still required in addition to any optional v

[Example](snippets/compose-fragment.yml)

##### `/fragments/docker-compose-fragment.yml` and `/fragments/docker-compose-fragment.3.7.yml`

Optional variants of `compose-fragment.yml` with a version of `2` and `3.7` respectively. Support for these is still present for backwards compatibility with older apps.The development environment will select the highest compose file version supplied by _all_ applications in the environment (2 --> 3.7 --> unversioned).

If the environment cannot identify a universal compose file version, then provisioning will fail.

Compose fragment variants are unsupported when used in conjunction with older compose fragment versions.

[2 Example](snippets/docker-compose-fragment.yml)

[3.7 Example](snippets/docker-compose-fragment.3.7.yml)

#### Other

##### `/Dockerfile`
Expand All @@ -120,7 +108,7 @@ This is a file that defines the application's Docker image. The Compose fragment

##### `/configuration.yml`

This file specifies which commodities the dev-env should create and launch for the application to use. If the commodity must be started before your application, ensure that it is also present in the appropriate section of the `docker-compose-fragment` file (e.g. `depends_on`).
This file specifies which commodities the dev-env should create and launch for the application to use. If the commodity must be started before your application, ensure that it is also present in the appropriate section of the `compose-fragment` file (e.g. `depends_on`).

The list of allowable commodity values is:

Expand All @@ -144,7 +132,7 @@ The list of allowable commodity values is:

The file may optionally also indicate that one or more services are resource intensive ("expensive") when starting up. The dev env will start those containers seperately - 3 at a time - and wait until each are declared healthy (or crash and get restarted 10 times) before starting any more.

This requires a healthcheck command specified here or in the Dockerfile/docker-compose-fragment (in which case just use 'docker' in this file).
This requires a healthcheck command specified here or in the Dockerfile/compose-fragment (in which case just use 'docker' in this file).

If one of these expensive services prefers another one to be considered "healthy" before a startup attempt is made (such as a database, to ensure immediate connectivity and no expensive restarts) then the dependent service can be specified here, with a healthcheck command following the same rules as above.

Expand Down Expand Up @@ -378,7 +366,7 @@ Any messages that get forwarded to the logstash\* container on TCP port 25826 wi

\* Note that it is not really logstash, but we kept the container name that for backwards compatibility purposes.

If you want to make use of this functionality, ensure that `logstash` is also present in the appropriate section of the `docker-compose-fragment` file (e.g. `depends_on`).
If you want to make use of this functionality, ensure that `logstash` is also present in the appropriate section of the `compose-fragment` file (e.g. `depends_on`).

## Hints and Tips

Expand Down
6 changes: 0 additions & 6 deletions apps/root-docker-compose-fragment.3.7.yml

This file was deleted.

6 changes: 0 additions & 6 deletions apps/root-docker-compose-fragment.yml

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/add-aliases.sh
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function devenv-help(){
manage <name of container> <command> - run manage.py commands in a container
alembic <name of container> <command> - run an alembic db command in a container, with the appropriate environment variables preset
add-to-docker-compose
<name of new compose fragment> - looks in fragments folder of loaded apps to search for a new docker-compose-fragment including the provided parameter eg docker-compose-syt2-fragment then runs docker-compose up
<name of new compose fragment> - looks in fragments folder of loaded apps to search for a new compose-fragment including the provided parameter eg docker-compose-syt2-fragment then runs docker-compose up
cadence-cli - runs the command line tool to interact with cadence orchestrator
localstack - run localstack (aws) commands in the localstack container
EOF
Expand Down
12 changes: 0 additions & 12 deletions scripts/docker/activemq/docker-compose-fragment.3.7.yml

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/docker/activemq/docker-compose-fragment.yml

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/docker/auth/docker-compose-fragment.3.7.yml

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/docker/auth/docker-compose-fragment.yml

This file was deleted.

11 changes: 0 additions & 11 deletions scripts/docker/cadence-web/docker-compose-fragment.3.7.yml

This file was deleted.

11 changes: 0 additions & 11 deletions scripts/docker/cadence-web/docker-compose-fragment.yml

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/docker/cadence/docker-compose-fragment.3.7.yml

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/docker/cadence/docker-compose-fragment.yml

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/docker/db2_community/docker-compose-fragment.3.7.yml

This file was deleted.

12 changes: 0 additions & 12 deletions scripts/docker/db2_community/docker-compose-fragment.yml

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/docker/elasticsearch5/docker-compose-fragment.3.7.yml

This file was deleted.

19 changes: 0 additions & 19 deletions scripts/docker/elasticsearch5/docker-compose-fragment.yml

This file was deleted.

18 changes: 0 additions & 18 deletions scripts/docker/elasticsearch7/docker-compose-fragment.3.7.yml

This file was deleted.

19 changes: 0 additions & 19 deletions scripts/docker/elasticsearch7/docker-compose-fragment.yml

This file was deleted.

9 changes: 0 additions & 9 deletions scripts/docker/ibmmq/docker-compose-fragment.3.7.yml

This file was deleted.

9 changes: 0 additions & 9 deletions scripts/docker/ibmmq/docker-compose-fragment.yml

This file was deleted.

8 changes: 0 additions & 8 deletions scripts/docker/localstack/docker-compose-fragment.3.7.yml

This file was deleted.

8 changes: 0 additions & 8 deletions scripts/docker/localstack/docker-compose-fragment.yml

This file was deleted.

11 changes: 0 additions & 11 deletions scripts/docker/logging/docker-compose-fragment.3.7.yml

This file was deleted.

11 changes: 0 additions & 11 deletions scripts/docker/logging/docker-compose-fragment.yml

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/docker/postgres-13/docker-compose-fragment.3.7.yml

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/docker/postgres-13/docker-compose-fragment.yml

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/docker/postgres-17/docker-compose-fragment.3.7.yml

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/docker/postgres-17/docker-compose-fragment.yml

This file was deleted.

9 changes: 0 additions & 9 deletions scripts/docker/rabbitmq/docker-compose-fragment.3.7.yml

This file was deleted.

Loading

0 comments on commit 858d7c9

Please sign in to comment.