From ed42f98a986bf5cabd03da12df7a0a83384f3b17 Mon Sep 17 00:00:00 2001 From: Alex Sharov Date: Wed, 13 Jul 2022 14:45:00 +0700 Subject: [PATCH] backward compatibility: use default UID=1000 GID=1000 (#4702) * backward compatibility: use default UID=1000 GID=1000 * backward compatibility: use default UID=1000 GID=1000 --- .env.example | 4 ++-- docker-compose.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env.example b/.env.example index 78ad26cbc5e..29bcc7c987f 100644 --- a/.env.example +++ b/.env.example @@ -2,5 +2,5 @@ ERIGON_USER=erigon # UID, GID of user inside docker process which must exist also on host OS -DOCKER_UID=3473 # random number [1001, 10000] chosen arbitrarily for example -DOCKER_GID=3473 # can choose any valid #. 1000 tends to be taken by first user +DOCKER_UID=1000 # random number [1001, 10000] chosen arbitrarily for example +DOCKER_GID=1000 # can choose any valid #. 1000 tends to be taken by first user diff --git a/docker-compose.yml b/docker-compose.yml index 1fed2c340c6..40cf128e883 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,11 +25,11 @@ services: erigon: image: thorax/erigon:${TAG:-latest} build: - args: - UID: ${DOCKER_UID} - GID: ${DOCKER_GID} - context: . - user: "${DOCKER_UID}:${DOCKER_GID}" + args: + UID: ${DOCKER_UID:1000} + GID: ${DOCKER_GID:1000} + context: . + user: "${DOCKER_UID:1000}:${DOCKER_GID:1000}" command: | erigon ${ERIGON_FLAGS-} --private.api.addr=0.0.0.0:9090 --sentry.api.addr=sentry:9091 --downloader.api.addr=downloader:9093 --txpool.disable @@ -67,7 +67,7 @@ services: prometheus: image: prom/prometheus:v2.36.2 - user: ${DOCKER_UID}:${DOCKER_GID} # Uses erigon user from Dockerfile + user: ${DOCKER_UID:1000}:${DOCKER_GID:1000} # Uses erigon user from Dockerfile command: --log.level=warn --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/prometheus --storage.tsdb.retention.time=150d --web.console.libraries=/usr/share/prometheus/console_libraries --web.console.templates=/usr/share/prometheus/consoles ports: [ "9090:9090" ] volumes: