Skip to content

Add docker-compose merge file for production build #1822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2024

Conversation

rmunn
Copy link
Collaborator

@rmunn rmunn commented May 27, 2024

Fixes #1821

Description

This will allow the default docker-compose.yml file to build the development build, but allow passing an extra -f flag to docker compose in order to build the production build instead. (This is the Docker Compose equivalent of kustomize, though a little easier to use and understand than kustomize).

Screenshots

Demonstrate any UI / behavioral changes with screenshots or animations.

Checklist

  • I have labeled my PR with: bug, feature, engineering, security fix or testing
  • I have performed a self-review of my own code
  • I have reviewed the title & description of this PR which I will use as the squashed PR commit message
  • I have commented my code, particularly in hard-to-understand areas
  • I have added tests that prove my fix is effective or that my feature works
  • I have enabled auto-merge (optional)

Testing

Testers, use the following instructions against our staging environment. Post your findings as a comment and include any meaningful screenshots, etc.

Describe how to verify your changes and provide any necessary test data.

  • Check PR, make sure tests still pass
  • Edit your Makefile and change the docker compose build steps to include -f docker-compose.yml -f docker-compose.production.yml and make sure running various make commands still works.

This will allow the default docker-compose.yml file to build the
development build, but allow passing an extra `-f` flag to docker
compose in order to build the production build instead.
@rmunn rmunn added the engineering Tasks which do not directly relate to a user-facing feature or fix label May 27, 2024
@rmunn rmunn self-assigned this May 27, 2024
Copy link

github-actions bot commented May 27, 2024

Unit Test Results

362 tests   362 ✅  13s ⏱️
 37 suites    0 💤
  1 files      0 ❌

Results for commit 02a1e51.

♻️ This comment has been updated with latest results.

The docker-compose.production.yml file already defines the ENVIRONMENT
build arg (and env var) everywhere required, so the command-line arg to
docker compose is now redundant.
@rmunn rmunn requested a review from hahn-kev June 11, 2024 09:47
Copy link
Collaborator

@hahn-kev hahn-kev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice work!

@rmunn rmunn merged commit 037646b into develop Jun 12, 2024
17 checks passed
@rmunn rmunn deleted the chore/docker-compose-production-merge branch June 12, 2024 04:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
engineering Tasks which do not directly relate to a user-facing feature or fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use docker compose merge file in integrate-and-deploy step
2 participants