Skip to content

Commit

Permalink
Update remaining references to docker-compose to compose.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
NickPhura committed Aug 13, 2024
1 parent bc9e0c2 commit c33b8b0
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Below are all of the relevant files that need to be updated when modifying envir
#### Local Development

- `env.docker`
- `docker-compose.yml`
- `compose.yml`
- `app/src/contexts/configContext.tsx`

#### Deployed to OpenShift
Expand Down
2 changes: 1 addition & 1 deletion api/.docker/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ########################################################################################################
# This DockerFile is used for local development (via docker-compose) only.
# This DockerFile is used for local development (via compose.yml) only.
# ########################################################################################################

FROM node:20
Expand Down
2 changes: 1 addition & 1 deletion app/.docker/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ########################################################################################################
# This DockerFile is used for local development (via docker-compose) only.
# This DockerFile is used for local development (via compose.yml) only.
# ########################################################################################################

FROM node:20
Expand Down
2 changes: 1 addition & 1 deletion app/server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const request = require('request');
* This includes a health check endpoint that OpenShift uses to determine if the app is healthy.
*
* This file is only used when serving the app in OpenShift.
* When running the app locally, the app is served by docker-compose, and doesn't use this file at all.
* When running the app locally, the app is served by compose.yml, and doesn't use this file at all.
*
* Note: All changes to env vars here must also be reflected in the `app/src/contexts/configContext.tsx` file, so that
* the app has access to the same env vars when running in both OpenShift and local development.
Expand Down
2 changes: 1 addition & 1 deletion app/src/contexts/configContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const parseFeatureFlagsString = (featureFlagsString: string): string[] => {
* This is used when running the app locally in docker.
*
* Note: All changes to env vars here must also be reflected in the `app/server/index.js` file, so that the app has
* access to the same env vars when running in both local development (via docker-compose) and in OpenShift.
* access to the same env vars when running in both local development (via compose.yml) and in OpenShift.
*
* @return {*} {IConfig}
*/
Expand Down
2 changes: 1 addition & 1 deletion database/.docker/db/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ########################################################################################################
# This DockerFile is used for local development (via docker-compose) only.
# This DockerFile is used for local development (via compose.yml) only.
# ########################################################################################################

ARG POSTGRES_VERSION=12.5
Expand Down
2 changes: 1 addition & 1 deletion database/.docker/db/Dockerfile.setup
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ########################################################################################################
# This DockerFile is used for both Openshift deployments and local development (via docker-compose).
# This DockerFile is used for both Openshift deployments and local development (via compose.yml).
# ########################################################################################################

FROM node:20
Expand Down
4 changes: 2 additions & 2 deletions env_config/env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#
# These env vars are automatically read by the makefile (when running make commands).
#
# Newly added environment variables need to be added to the docker-compose file,
# Newly added environment variables need to be added to the compose.yml file,
# under whichever service needs them (api, app, etc)
#
# Exposed Ports/URLs
# - Certain ports/urls are exposed in docker-compose and may conflict with other
# - Certain ports/urls are exposed in compose.yml and may conflict with other
# docker-containers if they are exposing the same ports/urls.
#
# - If conflicts arise, modify the conflicting values in your `.env` and re-build.
Expand Down

0 comments on commit c33b8b0

Please sign in to comment.