Skip to content
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.

Sign up for GitHub

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

Jump to bottom

26 review and improve docker compose scripts #53

Merged
merged 10 commits into from
Jul 5, 2023
Merged

26 review and improve docker compose scripts #53

merged 10 commits into from
Jul 5, 2023

Conversation

panositi
Copy link
Contributor

@panositi panositi commented Jul 3, 2023

No description provided.

@panositi panositi linked an issue Jul 3, 2023 that may be closed by this pull request
Review and improve docker-compose scripts #26
Closed
5 tasks
scp93ch
scp93ch requested changes Jul 4, 2023
View reviewed changes
Copy link
Member

@scp93ch scp93ch left a comment

Choose a reason for hiding this comment

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

The provisioning/ssm.entrypoint.sh file should not be there.

src/main/resources/application.properties Outdated
@@ -10,7 +10,7 @@ spring.application.version=@VERSION@
server.port=8081
######### WARNING: This property should match (API_)END_POINT in /src/main/webapp/config/config.js #########
server.servlet.contextPath=/system-modeller
reset.on.start=true
reset.on.start=${RESET_ON_START:true}
Copy link
Member

Choose a reason for hiding this comment

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

This line change is not require, please revert it

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed provisioning/ssm and revoke application.properties change

@scp93ch scp93ch self-requested a review July 5, 2023 10:23
@scp93ch
Adds more info on ports (#26)
04b6299 
Also tidies up some bare URLs and removes the explicit proxy container name.
@scp93ch
Copy link
Member

scp93ch commented Jul 5, 2023

I've made a commit to README.md and docker-compose.yml (please check it).

Aside from that:

The provisioning/keycloak/healthcheck.sh script has been added but it is not referenced in any of the docker files. Presumably we need to add in a healthcheck statement to docker-compose.yml?

docker-compose.test.yml refers to .env.template as does the test.yml CI script. If we needed this I think just one place would do. However, the whole .env.template file is commented out so surely the references to .env.template are not required?

@panositi
Copy link
Contributor Author

panositi commented Jul 5, 2023 •
edited
Loading

Health check, it is not used actually. The options we have are:

  • remove healthcheck.sh
  • modify docker-compose.yml to make use of it.

Health check was introduced in the deployment repository to prevent ssm container starting before the keycloak.

since the whole .env.template is commented out we do not need to reference it explicitly then.

@scp93ch scp93ch merged commit 583d768 into dev Jul 5, 2023
@scp93ch scp93ch deleted the 26-review-and-improve-docker-compose-scripts branch July 5, 2023 13:35
@scp93ch scp93ch removed a link to an issue Jul 5, 2023
Review and improve docker-compose scripts #26
Closed
5 tasks
@kenmeacham kenmeacham added this to the Release version 3.5.0 milestone Apr 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scp93ch scp93ch scp93ch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Release version 3.5.0
Development

Successfully merging this pull request may close these issues.
3 participants
@panositi @scp93ch @kenmeacham