From b80927f8c4e85c13c4dd8fe214e3c03c3ee079a0 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Wed, 25 Jan 2017 16:33:13 -0800 Subject: [PATCH] Run update.sh --- drupal/README.md | 46 +++++++++++++++++++++++++++++++++++++++++++++- postgres/README.md | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/drupal/README.md b/drupal/README.md index 077cf3e32..44351ff83 100644 --- a/drupal/README.md +++ b/drupal/README.md @@ -57,6 +57,41 @@ $ docker run --name some-drupal --link some-postgres:postgres -d drupal - Database name/username/password: `
` (`POSTGRES_USER`, `POSTGRES_PASSWORD`; see environment variables in the description for [`postgres`](https://registry.hub.docker.com/_/postgres/)) - ADVANCED OPTIONS; Database host: `postgres` (for using the `/etc/hosts` entry added by `--link` to access the linked container's PostgreSQL instance) +## Volumes + +By default, this image does not include any volumes. There is a lot of good discussion on this topic in [docker-library/drupal#3](https://github.com/docker-library/drupal/issues/3), which is definitely recommended reading. + +There is consensus that `/var/www/html/modules`, `/var/www/html/profiles`, and `/var/www/html/themes` are things that generally ought to be volumes (and might have an explicit `VOLUME` declaration in a future update to this image), but handling of `/var/www/html/sites` is somewhat more complex, since the contents of that directory *do* need to be initialized with the contents from the image. + +If using bind-mounts, one way to accomplish pre-seeding your local `sites` directory would be something like the following: + +```console +$ docker run --rm drupal tar -cC /var/www/html/sites . | tar -xC /path/on/host/sites +``` + +This can then be bind-mounted into a new container: + +```console +$ docker run --name some-drupal --link some-postgres:postgres -d \ + -v /path/on/host/modules:/var/www/html/modules \ + -v /path/on/host/profiles:/var/www/html/profiles \ + -v /path/on/host/sites:/var/www/html/sites \ + -v /path/on/host/themes:/var/www/html/themes \ + drupal +``` + +Another solution using Docker Volumes: + +```console +$ docker volume create drupal-sites +$ docker run --rm -v drupal-sites:/temporary/sites drupal cp -aRT /var/www/html/sites /temporary/sites +$ docker run --name some-drupal --link some-postgres:postgres -d \ + -v drupal-modules:/var/www/html/modules \ + -v drupal-profiles:/var/www/html/profiles \ + -v drupal-sites:/var/www/html/sites \ + -v drupal-themes:/var/www/html/themes \ +``` + ## ... via [`docker-compose`](https://github.com/docker/compose) Example `docker-compose.yml` for `drupal`: @@ -64,7 +99,8 @@ Example `docker-compose.yml` for `drupal`: ```yaml # Drupal with PostgreSQL # -# Access via "http://localhost:8080" (or "http://$(docker-machine ip):8080" if using docker-machine) +# Access via "http://localhost:8080" +# (or "http://$(docker-machine ip):8080" if using docker-machine) # # During initial Drupal setup, # Database type: PostgreSQL @@ -81,6 +117,14 @@ services: image: drupal:8.2-apache ports: - 8080:80 + volumes: + - /var/www/html/modules + - /var/www/html/profiles + - /var/www/html/themes + # this takes advantage of the feature in Docker that a new anonymous + # volume (which is what we're creating here) will be initialized with the + # existing content of the image at the same location + - /var/www/html/sites restart: always postgres: diff --git a/postgres/README.md b/postgres/README.md index c24492d02..337126ec8 100644 --- a/postgres/README.md +++ b/postgres/README.md @@ -83,6 +83,47 @@ This optional environment variable can be used to define a different name for th This optional environment variable can be used to send arguments to `postgres initdb`. The value is a space separated string of arguments as `postgres initdb` would expect them. This is useful for adding functionality like data page checksums: `-e POSTGRES_INITDB_ARGS="--data-checksums"`. +## Arbitrary `--user` Notes + +As of [docker-library/postgres#253](https://github.com/docker-library/postgres/pull/253), this image supports running as a (mostly) arbitrary user via `--user` on `docker run`. + +The main caveat to note is that `postgres` doesn't care what UID it runs as (as long as the owner of `/var/lib/postgresql/data` matches), but `initdb` *does* care (and needs the user to exist in `/etc/passwd`): + +```console +$ docker run -it --rm --user www-data postgres +The files belonging to this database system will be owned by user "www-data". +... + +$ docker run -it --rm --user 1000:1000 postgres +initdb: could not look up effective user ID 1000: user does not exist +``` + +The two easiest ways to get around this: + +1. bind-mount `/etc/passwd` read-only from the host (if the UID you desire is a valid user on your host): + + ```console + $ docker run -it --rm --user "$(id -u):$(id -g)" -v /etc/passwd:/etc/passwd:ro postgres + The files belonging to this database system will be owned by user "jsmith". + ... + ``` + +2. initialize the target directory separately from the final runtime (with a `chown` in between): + + ```console + $ docker volume create pgdata + $ docker run -it --rm -v pgdata:/var/lib/postgresql/data postgres + The files belonging to this database system will be owned by user "postgres". + ... + ( once it's finished initializing successfully and is waiting for connections, stop it ) + $ docker run -it --rm -v pgdata:/var/lib/postgresql/data bash chown -R 1000:1000 /var/lib/postgresql/data + $ docker run -it --rm --user 1000:1000 -v pgdata:/var/lib/postgresql/data postgres + LOG: database system was shut down at 2017-01-20 00:03:23 UTC + LOG: MultiXact member wraparound protections are now enabled + LOG: autovacuum launcher started + LOG: database system is ready to accept connections + ``` + # How to extend this image If you would like to do additional initialization in an image derived from this one, add one or more `*.sql` or `*.sh` scripts under `/docker-entrypoint-initdb.d` (creating the directory if necessary). After the entrypoint calls `initdb` to create the default `postgres` user and database, it will run any `*.sql` files and source any `*.sh` scripts found in that directory to do further initialization before starting the service.