pelias
/
docker
mirror of https://github.com/pelias/docker.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Allow configuring container process UID 

By default, all Pelias images now have a user called `pelias` with UID
1000. However, running as a different UID may be best for different
people.

By setting the default in `.env` and using it in `docker-compose.yml`,
we can allow people running Pelias to use whatever non-root user is best
for them.

Connects https://github.com/pelias/baseimage/pull/2
Connects https://github.com/pelias/pelias/issues/745
pull/20/head
Julian Simioni 6 years ago
parent
03505ba16a
commit
2fb5d2c74c
No known key found for this signature in database
GPG Key ID: B9EEB0C6EE0910A1
9 changed files with 58 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      README.md
  2. 1
      projects/france/.env
  3. 11
      projects/france/docker-compose.yml
  4. 1
      projects/los-angeles-metro/.env
  5. 13
      projects/los-angeles-metro/docker-compose.yml
  6. 1
      projects/portland-metro/.env
  7. 12
      projects/portland-metro/docker-compose.yml
  8. 1
      projects/south-africa/.env
  9. 13
      projects/south-africa/docker-compose.yml

7
README.md
Unescape View File

@ -81,6 +81,7 @@ Then use your text editor to modify the `.env` file to reflect your new path, it
```bash ```bash
COMPOSE_PROJECT_NAME=pelias COMPOSE_PROJECT_NAME=pelias
DATA_DIR=/tmp/pelias DATA_DIR=/tmp/pelias
DOCKER_USER=1000
``` ```
You can then list the environment variables to ensure they have been correctly set: You can then list the environment variables to ensure they have been correctly set:
@ -95,6 +96,12 @@ The compose variables are optional and are documented here: https://docs.docker.
Note: changing the `COMPOSE_PROJECT_NAME` variable is not advisable unless you know what you are doing. If you are migrating from the deprecated `pelias/dockerfiles` repository then you can set `COMPOSE_PROJECT_NAME=dockerfiles` to enable backwards compatibility with containers created using that repository. Note: changing the `COMPOSE_PROJECT_NAME` variable is not advisable unless you know what you are doing. If you are migrating from the deprecated `pelias/dockerfiles` repository then you can set `COMPOSE_PROJECT_NAME=dockerfiles` to enable backwards compatibility with containers created using that repository.
### Variable: DOCKER_USER
All processes in Pelias containers are run as non-root users. By default, the UID of the processes will be `1000`, which is the first user ID on _most_ Linux systems and is likely to be a good option. However, if restricting file permissions in your data directory to a different user or group is important, this can be overridden by setting the `DOCKER_USER` variable.
This variable can take just a UID or a UID:GID combination such as `1000:1000`. See the [docker-compose](https://docs.docker.com/compose/compose-file/#domainname-hostname-ipc-mac_address-privileged-read_only-shm_size-stdin_open-tty-user-working_dir) and [docker run](https://docs.docker.com/engine/reference/run/#user) documentation on controlling Docker container users for more information.
## CLI commands ## CLI commands
```bash ```bash

1
projects/france/.env
Unescape View File

@ -1,2 +1,3 @@
COMPOSE_PROJECT_NAME=pelias COMPOSE_PROJECT_NAME=pelias
DATA_DIR=/tmp/pelias/france DATA_DIR=/tmp/pelias/france
DOCKER_USER=1000

11
projects/france/docker-compose.yml
Unescape View File

@ -2,21 +2,23 @@ version: '3'
networks: networks:
default: default:
driver: bridge driver: bridge
volumes:
services: services:
libpostal: libpostal:
image: pelias/libpostal-service image: pelias/libpostal-service
container_name: pelias_libpostal container_name: pelias_libpostal
user: "${DOCKER_USER}"
restart: always restart: always
ports: [ "4400:4400" ] ports: [ "4400:4400" ]
schema: schema:
image: pelias/schema:portland-synonyms image: pelias/schema:portland-synonyms
container_name: pelias_schema container_name: pelias_schema
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
api: api:
image: pelias/api:master image: pelias/api:master
container_name: pelias_api container_name: pelias_api
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4000" ] environment: [ "PORT=4000" ]
ports: [ "4000:4000" ] ports: [ "4000:4000" ]
@ -25,6 +27,7 @@ services:
placeholder: placeholder:
image: pelias/placeholder:master image: pelias/placeholder:master
container_name: pelias_placeholder container_name: pelias_placeholder
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4100" ] environment: [ "PORT=4100" ]
ports: [ "4100:4100" ] ports: [ "4100:4100" ]
@ -34,30 +37,35 @@ services:
whosonfirst: whosonfirst:
image: pelias/whosonfirst:master image: pelias/whosonfirst:master
container_name: pelias_whosonfirst container_name: pelias_whosonfirst
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
openstreetmap: openstreetmap:
image: pelias/openstreetmap:master image: pelias/openstreetmap:master
container_name: pelias_openstreetmap container_name: pelias_openstreetmap
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
openaddresses: openaddresses:
image: pelias/openaddresses:master image: pelias/openaddresses:master
container_name: pelias_openaddresses container_name: pelias_openaddresses
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
polylines: polylines:
image: pelias/polylines:master image: pelias/polylines:master
container_name: pelias_polylines container_name: pelias_polylines
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
interpolation: interpolation:
image: pelias/interpolation:master image: pelias/interpolation:master
container_name: pelias_interpolation container_name: pelias_interpolation
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4300" ] environment: [ "PORT=4300" ]
ports: [ "4300:4300" ] ports: [ "4300:4300" ]
@ -67,6 +75,7 @@ services:
pip: pip:
image: pelias/pip-service:master image: pelias/pip-service:master
container_name: pelias_pip-service container_name: pelias_pip-service
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4200" ] environment: [ "PORT=4200" ]
ports: [ "4200:4200" ] ports: [ "4200:4200" ]

1
projects/los-angeles-metro/.env
Unescape View File

@ -1,2 +1,3 @@
COMPOSE_PROJECT_NAME=pelias COMPOSE_PROJECT_NAME=pelias
DATA_DIR=/tmp/pelias/los-angeles-metro DATA_DIR=/tmp/pelias/los-angeles-metro
DOCKER_USER=1000

13
projects/los-angeles-metro/docker-compose.yml
Unescape View File

@ -2,16 +2,17 @@ version: '3'
networks: networks:
default: default:
driver: bridge driver: bridge
volumes:
services: services:
libpostal: libpostal:
image: pelias/libpostal-service image: pelias/libpostal-service
container_name: pelias_libpostal container_name: pelias_libpostal
user: "${DOCKER_USER}"
restart: always restart: always
ports: [ "4400:4400" ] ports: [ "4400:4400" ]
schema: schema:
image: pelias/schema:portland-synonyms image: pelias/schema:portland-synonyms
container_name: pelias_schema container_name: pelias_schema
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "./synonyms/custom_name.txt:/code/pelias/schema/synonyms/custom_name.txt" - "./synonyms/custom_name.txt:/code/pelias/schema/synonyms/custom_name.txt"
@ -19,6 +20,7 @@ services:
api: api:
image: pelias/api:master image: pelias/api:master
container_name: pelias_api container_name: pelias_api
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4000" ] environment: [ "PORT=4000" ]
ports: [ "4000:4000" ] ports: [ "4000:4000" ]
@ -27,6 +29,7 @@ services:
placeholder: placeholder:
image: pelias/placeholder:master image: pelias/placeholder:master
container_name: pelias_placeholder container_name: pelias_placeholder
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4100" ] environment: [ "PORT=4100" ]
ports: [ "4100:4100" ] ports: [ "4100:4100" ]
@ -36,36 +39,42 @@ services:
whosonfirst: whosonfirst:
image: pelias/whosonfirst:master image: pelias/whosonfirst:master
container_name: pelias_whosonfirst container_name: pelias_whosonfirst
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
openstreetmap: openstreetmap:
image: pelias/openstreetmap:master image: pelias/openstreetmap:master
container_name: pelias_openstreetmap container_name: pelias_openstreetmap
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
openaddresses: openaddresses:
image: pelias/openaddresses:master image: pelias/openaddresses:master
container_name: pelias_openaddresses container_name: pelias_openaddresses
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
transit: transit:
image: pelias/transit:master image: pelias/transit:master
container_name: pelias_transit container_name: pelias_transit
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
polylines: polylines:
image: pelias/polylines:master image: pelias/polylines:master
container_name: pelias_polylines container_name: pelias_polylines
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
interpolation: interpolation:
image: pelias/interpolation:master image: pelias/interpolation:master
container_name: pelias_interpolation container_name: pelias_interpolation
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4300" ] environment: [ "PORT=4300" ]
ports: [ "4300:4300" ] ports: [ "4300:4300" ]
@ -75,6 +84,7 @@ services:
pip: pip:
image: pelias/pip-service:master image: pelias/pip-service:master
container_name: pelias_pip-service container_name: pelias_pip-service
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4200" ] environment: [ "PORT=4200" ]
ports: [ "4200:4200" ] ports: [ "4200:4200" ]
@ -99,6 +109,7 @@ services:
fuzzy-tester: fuzzy-tester:
image: pelias/fuzzy-tester:master image: pelias/fuzzy-tester:master
container_name: pelias_fuzzy_tester container_name: pelias_fuzzy_tester
user: "${DOCKER_USER}"
restart: "no" restart: "no"
command: "--help" command: "--help"
volumes: volumes:

1
projects/portland-metro/.env
Unescape View File

@ -1,2 +1,3 @@
COMPOSE_PROJECT_NAME=pelias COMPOSE_PROJECT_NAME=pelias
DATA_DIR=/tmp/pelias/portland-metro DATA_DIR=/tmp/pelias/portland-metro
DOCKER_USER=1000

12
projects/portland-metro/docker-compose.yml
Unescape View File

@ -6,11 +6,13 @@ services:
libpostal: libpostal:
image: pelias/libpostal-service image: pelias/libpostal-service
container_name: pelias_libpostal container_name: pelias_libpostal
user: "${DOCKER_USER}"
restart: always restart: always
ports: [ "4400:4400" ] ports: [ "4400:4400" ]
schema: schema:
image: pelias/schema:portland-synonyms image: pelias/schema:portland-synonyms
container_name: pelias_schema container_name: pelias_schema
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "./synonyms/custom_name.txt:/code/pelias/schema/synonyms/custom_name.txt" - "./synonyms/custom_name.txt:/code/pelias/schema/synonyms/custom_name.txt"
@ -18,6 +20,7 @@ services:
api: api:
image: pelias/api:master image: pelias/api:master
container_name: pelias_api container_name: pelias_api
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4000" ] environment: [ "PORT=4000" ]
ports: [ "4000:4000" ] ports: [ "4000:4000" ]
@ -26,6 +29,7 @@ services:
placeholder: placeholder:
image: pelias/placeholder:master image: pelias/placeholder:master
container_name: pelias_placeholder container_name: pelias_placeholder
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4100" ] environment: [ "PORT=4100" ]
ports: [ "4100:4100" ] ports: [ "4100:4100" ]
@ -35,6 +39,7 @@ services:
whosonfirst: whosonfirst:
image: pelias/whosonfirst:master image: pelias/whosonfirst:master
container_name: pelias_whosonfirst container_name: pelias_whosonfirst
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
@ -42,6 +47,7 @@ services:
openstreetmap: openstreetmap:
image: pelias/openstreetmap:master image: pelias/openstreetmap:master
container_name: pelias_openstreetmap container_name: pelias_openstreetmap
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
@ -49,6 +55,7 @@ services:
openaddresses: openaddresses:
image: pelias/openaddresses:master image: pelias/openaddresses:master
container_name: pelias_openaddresses container_name: pelias_openaddresses
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
@ -56,18 +63,21 @@ services:
transit: transit:
image: pelias/transit:master image: pelias/transit:master
container_name: pelias_transit container_name: pelias_transit
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
polylines: polylines:
image: pelias/polylines:master image: pelias/polylines:master
container_name: pelias_polylines container_name: pelias_polylines
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
interpolation: interpolation:
image: pelias/interpolation:master image: pelias/interpolation:master
container_name: pelias_interpolation container_name: pelias_interpolation
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4300" ] environment: [ "PORT=4300" ]
ports: [ "4300:4300" ] ports: [ "4300:4300" ]
@ -77,6 +87,7 @@ services:
pip: pip:
image: pelias/pip-service:master image: pelias/pip-service:master
container_name: pelias_pip-service container_name: pelias_pip-service
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4200" ] environment: [ "PORT=4200" ]
ports: [ "4200:4200" ] ports: [ "4200:4200" ]
@ -101,6 +112,7 @@ services:
fuzzy-tester: fuzzy-tester:
image: pelias/fuzzy-tester:master image: pelias/fuzzy-tester:master
container_name: pelias_fuzzy_tester container_name: pelias_fuzzy_tester
user: "${DOCKER_USER}"
restart: "no" restart: "no"
command: "--help" command: "--help"
volumes: volumes:

1
projects/south-africa/.env
Unescape View File

@ -1,2 +1,3 @@
COMPOSE_PROJECT_NAME=pelias_za COMPOSE_PROJECT_NAME=pelias_za
DATA_DIR=/tmp/pelias/pelias_za DATA_DIR=/tmp/pelias/pelias_za
DOCKER_USER=1000

13
projects/south-africa/docker-compose.yml
Unescape View File

@ -2,16 +2,17 @@ version: '3'
networks: networks:
default: default:
driver: bridge driver: bridge
volumes:
services: services:
libpostal: libpostal:
image: pelias/libpostal-service image: pelias/libpostal-service
container_name: pelias_libpostal container_name: pelias_libpostal
user: "${DOCKER_USER}"
restart: always restart: always
ports: [ "4400:4400" ] ports: [ "4400:4400" ]
schema: schema:
image: pelias/schema:master image: pelias/schema:master
container_name: pelias_schema container_name: pelias_schema
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "./synonyms/custom_name.txt:/code/pelias/schema/synonyms/custom_name.txt" - "./synonyms/custom_name.txt:/code/pelias/schema/synonyms/custom_name.txt"
@ -19,6 +20,7 @@ services:
api: api:
image: pelias/api:master image: pelias/api:master
container_name: pelias_api container_name: pelias_api
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4000" ] environment: [ "PORT=4000" ]
ports: [ "4000:4000" ] ports: [ "4000:4000" ]
@ -27,6 +29,7 @@ services:
placeholder: placeholder:
image: pelias/placeholder:master image: pelias/placeholder:master
container_name: pelias_placeholder container_name: pelias_placeholder
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4100" ] environment: [ "PORT=4100" ]
ports: [ "4100:4100" ] ports: [ "4100:4100" ]
@ -36,12 +39,14 @@ services:
whosonfirst: whosonfirst:
image: pelias/whosonfirst:master image: pelias/whosonfirst:master
container_name: pelias_whosonfirst container_name: pelias_whosonfirst
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
openstreetmap: openstreetmap:
image: pelias/openstreetmap:master image: pelias/openstreetmap:master
container_name: pelias_openstreetmap container_name: pelias_openstreetmap
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
@ -49,24 +54,28 @@ services:
openaddresses: openaddresses:
image: pelias/openaddresses:master image: pelias/openaddresses:master
container_name: pelias_openaddresses container_name: pelias_openaddresses
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
transit: transit:
image: pelias/transit:master image: pelias/transit:master
container_name: pelias_transit container_name: pelias_transit
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
polylines: polylines:
image: pelias/polylines:master image: pelias/polylines:master
container_name: pelias_polylines container_name: pelias_polylines
user: "${DOCKER_USER}"
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
interpolation: interpolation:
image: pelias/interpolation:master image: pelias/interpolation:master
container_name: pelias_interpolation container_name: pelias_interpolation
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4300" ] environment: [ "PORT=4300" ]
ports: [ "4300:4300" ] ports: [ "4300:4300" ]
@ -76,6 +85,7 @@ services:
pip: pip:
image: pelias/pip-service:master image: pelias/pip-service:master
container_name: pelias_pip-service container_name: pelias_pip-service
user: "${DOCKER_USER}"
restart: always restart: always
environment: [ "PORT=4200" ] environment: [ "PORT=4200" ]
ports: [ "4200:4200" ] ports: [ "4200:4200" ]
@ -107,6 +117,7 @@ services:
fuzzy-tester: fuzzy-tester:
image: pelias/fuzzy-tester:master image: pelias/fuzzy-tester:master
container_name: pelias_fuzzy_tester container_name: pelias_fuzzy_tester
user: "${DOCKER_USER}"
restart: "no" restart: "no"
command: "--help" command: "--help"
volumes: volumes:

Write Preview
Loading…
Cancel
Save