You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by ab...@apache.org on 2023/10/26 04:19:35 UTC
[incubator-devlake] branch main updated: fix: docker compose dev from mericodev to apache (#6337)
This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new 37355ab94 fix: docker compose dev from mericodev to apache (#6337)
37355ab94 is described below
commit 37355ab94703c689a109c2639e3fbce525a3eeb3
Author: abeizn <zi...@merico.dev>
AuthorDate: Wed Oct 25 23:19:30 2023 -0500
fix: docker compose dev from mericodev to apache (#6337)
---
docker-compose-dev.yml | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index 439b84eaa..e43820da5 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -21,15 +21,14 @@ services:
- mysql-storage:/var/lib/mysql
restart: always
ports:
- - "127.0.0.1:3306:3306"
+ - 3306:3306
environment:
MYSQL_ROOT_PASSWORD: admin
MYSQL_DATABASE: lake
MYSQL_USER: merico
MYSQL_PASSWORD: merico
TZ: UTC
- command:
- --character-set-server=utf8mb4
+ command: --character-set-server=utf8mb4
--collation-server=utf8mb4_bin
--skip-log-bin
@@ -39,7 +38,7 @@ services:
- postgres-storage:/var/lib/postgresql
restart: always
ports:
- - 127.0.0.1:5432:5432
+ - 5432:5432
environment:
POSTGRES_DB: lake
POSTGRES_USER: merico
@@ -47,11 +46,11 @@ services:
TZ: UTC
grafana:
- image: devlake.docker.scarf.sh/mericodev/devlake-dashboard:latest
+ image: devlake.docker.scarf.sh/apache/devlake-dashboard:latest
build:
context: grafana/
ports:
- - "3002:3000"
+ - 3002:3000
volumes:
- grafana-storage:/var/lib/grafana
environment:
@@ -67,14 +66,14 @@ services:
- mysql
devlake:
- image: devlake.docker.scarf.sh/mericodev/devlake:latest
+ image: devlake.docker.scarf.sh/apache/devlake:latest
build:
context: backend
args:
HTTPS_PROXY: "${HTTPS_PROXY}"
GOPROXY: "${GOPROXY}"
ports:
- - "127.0.0.1:8080:8080"
+ - 8080:8080
restart: always
volumes:
- devlake-log:/app/logs
@@ -88,11 +87,11 @@ services:
- mysql
config-ui:
- image: devlake.docker.scarf.sh/mericodev/devlake-config-ui:latest
+ image: devlake.docker.scarf.sh/apache/devlake-config-ui:latest
build:
context: "config-ui"
ports:
- - "4000:4000"
+ - 4000:4000
env_file:
- ./.env
environment:
@@ -108,7 +107,7 @@ services:
image: quay.io/oauth2-proxy/oauth2-proxy:v7.4.0-amd64
network_mode: "host"
ports:
- - "4180:4180"
+ - 4180:4180
env_file:
- ./.env
# environment: