Top-level docker-compose.yml

[namedgraph]

Reasons for creating this PR

docker-compose setup unsuitable for multiple Skosmos deployments

Link to relevant issue(s), if any

• Closes docker-compose setup unsuitable for multiple Skosmos deployments #1511

Description of the changes in this PR

• 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

Known 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

• phpUnit tests pass locally with my changes
• I have added tests that show that the new code works, or tests are not relevant for this PR (e.g. only HTML/CSS changes)
• The PR doesn't reduce accessibility of the front-end code (e.g. tab focus, scaling to different resolutions, use of .sr-only class, color contrast)
• The PR doesn't introduce unintended code changes (e.g. empty lines or useless reindentation)

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (99448fc) 70.08% compared to head (0c0c439) 70.08%.
Report is 3 commits behind head on master.

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           

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[osma]

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.

[namedgraph]

I'll try this week.

[osma]

What's the status @namedgraph ? Can you fix dockerfiles/README.md so it syncs with the changes in this PR? Then we could merge this.

[sonarcloud]

SonarCloud Quality Gate failed.   

1 Bug
0 Vulnerabilities
0 Security Hotspots
4 Code Smells

No Coverage information
0.0% Duplication

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

[namedgraph]

@osma made changes. Are they good enough?

[osma]

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.