Several refactorings
ClosedPublic
Actions

Authored by douardda on Apr 10 2019, 12:29 PM.

Details

Reviewers

anlambert

Group Reviewers

Reviewers

Commits

rDENV6d49580cd56c: replica: ensure entrypoints are defined in replica related services
rDENV30e9c934ef20: lister: allways run the db initialization step
rDENVb7f02d8add7f: dockerfile: install python packages in a venv under the swh user
rDENV6558c6c8ad18: entrypoint: pgsql has been moved to ~swh/
rDENV53fa588c7fc2: Factorise the pip install of source repos in a shell function
rDENV7b0ea2803606: Remove entrypoint.sh files from the Dockerfile
rDENVd1f5b87ba8c7: Dockerfile: small readability refactoring
rCDFD30e9c934ef20: lister: allways run the db initialization step
rCDFD6558c6c8ad18: entrypoint: pgsql has been moved to ~swh/
rCDFD6d49580cd56c: replica: ensure entrypoints are defined in replica related services
rCDFDb7f02d8add7f: dockerfile: install python packages in a venv under the swh user
rCDFD53fa588c7fc2: Factorise the pip install of source repos in a shell function
rCDFD7b0ea2803606: Remove entrypoint.sh files from the Dockerfile
rCDFDd1f5b87ba8c7: Dockerfile: small readability refactoring

Summary

Mostly:

deploy entrypoint.sh files at exec time instead of copying them all in the image,
install python packages as swh user in a venv to make it easier to work with overloaded installation from sources (less caveats with file permissions),
set /srv/softwareheritahe as swh's HOME
and put every file in there (shell scripts, etc)

Depends on D1393

Diff Detail

Repository

rCDFD Dockerfiles for developers

Branch

current

Lint

Lint Skipped

Unit

Unit Tests Skipped

Build Status

Buildable 5300
Build 7182: arc lint + arc unit

Event Timeline

douardda created this revision.Apr 10 2019, 12:29 PM

Herald added a reviewer: Reviewers. · View Herald TranscriptApr 10 2019, 12:29 PM

Harbormaster completed remote builds in B5300: Diff 4490.Apr 10 2019, 12:29 PM

Instead of entrypoint: /entrypoint.sh for each service in docker-compose.yml, what about adding a RUN /entrypoint.sh in the Dockerfile?

Dockerfile
43	`/srv` is usually for data, not code. Maybe `/opt` or `/usr/local` instead?
services/swh-web/entrypoint.sh
17	why `\|\| true`?

In D1394#30318, @vlorentz wrote:

Instead of entrypoint: /entrypoint.sh for each service in docker-compose.yml, what about adding a RUN /entrypoint.sh in the Dockerfile?

We tried but that did not work as the /entrypoint.sh is not yet mounted.
Touching the file first fails as well as then docker will reasonably refuse to mount the volume on an existing file.

In D1394#30318, @vlorentz wrote:

Instead of entrypoint: /entrypoint.sh for each service in docker-compose.yml, what about adding a RUN /entrypoint.sh in the Dockerfile?

Already tested by David, and that doesn't work; On the intertubes I find people having the same issue and it looks like entrypoints set inside an image can't be overridden by a mount, something about a cache effect.