Top-level docker-compose.yml#1512
Top-level docker-compose.yml#1512osma merged 2 commits intoNatLibFi:masterfrom BeameryEdge:issues/1511
docker-compose.yml#1512Conversation
* moved `docker-compose.yml` to the top-level dir * fixed relative paths accordingly * removed `container_name` properties * replaced host port numbers with env variables with default values
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1512 +/- ##
=========================================
Coverage 70.08% 70.08%
- Complexity 1658 1659 +1
=========================================
Files 32 32
Lines 4272 4272
=========================================
Hits 2994 2994
Misses 1278 1278 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
The changes here look good and the reasons behind the changes were already discussed in issue #1511.
The documentation under dockerfiles/README.md needs to be updated as well. Currently it says that the docker compose command should be run under dockerfiles/ which obviously isn't true anymore after these changes. Also, the environment variables for setting the ports should be documented there.
When that is done (@namedgraph can you do it?) then this can be merged to master, i.e. Skosmos 2.x.
After that the changes should be also ported to the skosmos-3 branch because we want to keep the Docker configuration similar for both versions. On the skosmos-3 some additional adjustments to the phpunit and cypress test suite setup need to be done as well, probably just fixing up paths in tests/init_containers.sh that currently assume that the docker-compose.yml file is under dockerfiles/. I can do that once we have this in master.
|
I'll try this week. |
|
What's the status @namedgraph ? Can you fix |
Aligned with the new `docker-compose.yml` location
|
SonarCloud Quality Gate failed.
|
|
@osma made changes. Are they good enough? |
|
Looks good now so I'm merging this. Thanks a lot! The work still needs to be ported to Skosmos 3.x but I'll take care of that later. |
Reasons for creating this PR
docker-composesetup unsuitable for multiple Skosmos deploymentsLink to relevant issue(s), if any
docker-composesetup unsuitable for multiple Skosmos deployments #1511Description of the changes in this PR
docker-compose.ymlto the top-level dircontainer_namepropertiesKnown problems or uncertainties in this PR
Not tested directly :) But these changes work on our private fork and I was able to deploy 2 Skosmos instances on different ports on the same machine.
Checklist
.sr-onlyclass, color contrast)