Skip to content

Commit dd7b3ff

Browse files
committed
Merge branch 'pr/compose-configurable-image-registry' into versionUpgrade
2 parents 6005b20 + 0ea5d56 commit dd7b3ff

3 files changed

Lines changed: 11 additions & 4 deletions

File tree

docker-compose-dev-mysql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ services:
3434
--skip-log-bin
3535

3636
grafana:
37-
image: devlake.docker.scarf.sh/apache/devlake-dashboard:latest
37+
image: ${DEVLAKE_IMAGE_REGISTRY:-devlake.docker.scarf.sh}/apache/devlake-dashboard:latest
3838
build:
3939
context: grafana/
4040
ports:
@@ -87,7 +87,7 @@ services:
8787
- mysql
8888

8989
config-ui:
90-
image: devlake.docker.scarf.sh/apache/devlake-config-ui:latest
90+
image: ${DEVLAKE_IMAGE_REGISTRY:-devlake.docker.scarf.sh}/apache/devlake-config-ui:latest
9191
build:
9292
context: "config-ui"
9393
ports:

docker-compose-dev-postgresql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
TZ: UTC
3131

3232
grafana:
33-
image: devlake.docker.scarf.sh/apache/devlake-dashboard:latest
33+
image: ${DEVLAKE_IMAGE_REGISTRY:-devlake.docker.scarf.sh}/apache/devlake-dashboard:latest
3434
build:
3535
context: grafana/
3636
ports:
@@ -83,7 +83,7 @@ services:
8383
- postgres
8484

8585
config-ui:
86-
image: devlake.docker.scarf.sh/apache/devlake-config-ui:latest
86+
image: ${DEVLAKE_IMAGE_REGISTRY:-devlake.docker.scarf.sh}/apache/devlake-config-ui:latest
8787
build:
8888
context: "config-ui"
8989
ports:

env.example

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
# Lake core #
1919
#############
2020

21+
# Container image registry/prefix for the pre-built devlake-dashboard and
22+
# devlake-config-ui images used by the docker-compose-dev-*.yml files.
23+
# Upstream default is the Scarf gateway (download analytics for the Apache
24+
# project). Override locally (e.g. DEVLAKE_IMAGE_REGISTRY=docker.io) to pull
25+
# directly from Docker Hub and avoid Scarf download tracking.
26+
DEVLAKE_IMAGE_REGISTRY=devlake.docker.scarf.sh
27+
2128
# Lake plugin dir, absolute path or relative path
2229
PLUGIN_DIR=bin/plugins
2330
REMOTE_PLUGIN_DIR=python/plugins

0 commit comments

Comments
 (0)