diff options
| author | Stephen Finucane <stephen@that.guru> | 2018-04-17 09:58:00 +0100 |
|---|---|---|
| committer | Stephen Finucane <stephen@that.guru> | 2018-04-26 10:47:02 +0100 |
| commit | 98abeada054c4573bba9dcb20091df21304a598e (patch) | |
| tree | b66b0e4b1de74d78b529895b2e9fe6afaaf8f098 /tools/docker | |
| parent | 7484a8c044565ac8e683efdddfd726a5ecdc542a (diff) | |
| download | patchwork-98abeada054c4573bba9dcb20091df21304a598e.tar patchwork-98abeada054c4573bba9dcb20091df21304a598e.tar.gz | |
docker-compose: Switch to 3.0 syntax
Ubuntu 18.04 (Bionic Beaver) providers 'docker-compose' 1.17.1 [1] at
release which supports the 3.0 syntax [2]. Using this allows some users
(me) to resolve a long standing issue caused by a UID that's not 1000.
[1] https://packages.ubuntu.com/bionic/docker-compose
[2] https://docs.docker.com/compose/compose-file/
Signed-off-by: Stephen Finucane <stephen@that.guru>
Diffstat (limited to 'tools/docker')
| -rw-r--r-- | tools/docker/Dockerfile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 109410b..e25c381 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,8 +1,11 @@ FROM ubuntu:17.10 -ARG UID=1000 +ARG UID ARG TZ="Australia/Canberra" +RUN echo $UID +RUN [ -n "$UID" ] || { echo "You must define UID in .env" 1>&2; exit 1; } + ENV PROJECT_HOME /home/patchwork/patchwork ENV db_user root |