thunderstrike/plane
thunderstrike/plane
2
0
Fork 0
forked from github/plane
Code Pull Requests Activity

fix: docker inconsistencies (#1493)

Browse Source 
Co-authored-by: pablohashescobar <118773738+pablohashescobar@users.noreply.github.com>
This commit is contained in:
Quadrubo 2023-07-11 10:40:57 +02:00 committed by GitHub
parent abdb4a4778
commit 7087b1b5f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
docker-compose-hub.yml
View File

@ -31,7 +31,6 @@ x-api-and-worker-env: &api-and-worker-env
USE_MINIO: ${USE_MINIO} USE_MINIO: ${USE_MINIO}
ENABLE_SIGNUP: ${ENABLE_SIGNUP} ENABLE_SIGNUP: ${ENABLE_SIGNUP}
services: services:
plane-web: plane-web:
container_name: planefrontend container_name: planefrontend
@ -42,12 +41,14 @@ services:
- .env - .env
environment: environment:
NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL} NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL}
NEXT_PUBLIC_GOOGLE_CLIENTID: 0 NEXT_PUBLIC_GOOGLE_CLIENTID: "0"
NEXT_PUBLIC_GITHUB_APP_NAME: 0 NEXT_PUBLIC_GITHUB_APP_NAME: "0"
NEXT_PUBLIC_GITHUB_ID: 0 NEXT_PUBLIC_GITHUB_ID: "0"
NEXT_PUBLIC_SENTRY_DSN: 0 NEXT_PUBLIC_SENTRY_DSN: "0"
NEXT_PUBLIC_ENABLE_OAUTH: 0 NEXT_PUBLIC_ENABLE_OAUTH: "0"
NEXT_PUBLIC_ENABLE_SENTRY: 0 NEXT_PUBLIC_ENABLE_SENTRY: "0"
NEXT_PUBLIC_ENABLE_SESSION_RECORDER: "0"
NEXT_PUBLIC_TRACK_EVENTS: "0"
depends_on: depends_on:
- plane-api - plane-api
- plane-worker - plane-worker
@ -66,7 +67,7 @@ services:
- plane-redis - plane-redis
plane-worker: plane-worker:
container_name: planerqworker container_name: planebgworker
image: makeplane/plane-worker:latest image: makeplane/plane-worker:latest
restart: always restart: always
command: ./bin/worker command: ./bin/worker
@ -84,14 +85,15 @@ services:
image: postgres:15.2-alpine image: postgres:15.2-alpine
restart: always restart: always
command: postgres -c 'max_connections=1000' command: postgres -c 'max_connections=1000'
volumes:
- pgdata:/var/lib/postgresql/data
env_file: env_file:
- .env - .env
environment: environment:
POSTGRES_USER: ${PGUSER} POSTGRES_USER: ${PGUSER}
POSTGRES_DB: ${PGDATABASE} POSTGRES_DB: ${PGDATABASE}
POSTGRES_PASSWORD: ${PGPASSWORD} POSTGRES_PASSWORD: ${PGPASSWORD}
volumes: PGDATA: /var/lib/postgresql/data
- pgdata:/var/lib/postgresql/data
plane-redis: plane-redis:
container_name: plane-redis container_name: plane-redis
@ -103,9 +105,10 @@ services:
plane-minio: plane-minio:
container_name: plane-minio container_name: plane-minio
image: minio/minio image: minio/minio
restart: always
command: server /export --console-address ":9090"
volumes: volumes:
- uploads:/export - uploads:/export
command: server /export --console-address ":9090"
env_file: env_file:
- .env - .env
environment: environment:
@ -115,12 +118,9 @@ services:
createbuckets: createbuckets:
image: minio/mc image: minio/mc
entrypoint: > entrypoint: >
/bin/sh -c " /bin/sh -c " /usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY;
/usr/bin/mc config host add plane-minio http://plane-minio:9000 \$AWS_ACCESS_KEY_ID \$AWS_SECRET_ACCESS_KEY;
/usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME; /usr/bin/mc mb plane-minio/\$AWS_S3_BUCKET_NAME;
/usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME; /usr/bin/mc anonymous set download plane-minio/\$AWS_S3_BUCKET_NAME; exit 0; "
exit 0;
"
env_file: env_file:
- .env - .env
depends_on: depends_on:
@ -141,7 +141,6 @@ services:
- plane-web - plane-web
- plane-api - plane-api
volumes: volumes:
pgdata: pgdata:
redisdata: redisdata:

4
docker-compose.yml
View File

@ -40,7 +40,7 @@ services:
args: args:
NEXT_PUBLIC_API_BASE_URL: http://localhost:8000 NEXT_PUBLIC_API_BASE_URL: http://localhost:8000
restart: always restart: always
command: [ "/usr/local/bin/start.sh" ] command: /usr/local/bin/start.sh
env_file: env_file:
- .env - .env
environment: environment:
@ -57,7 +57,6 @@ services:
- plane-api - plane-api
- plane-worker - plane-worker
plane-api: plane-api:
container_name: planebackend container_name: planebackend
build: build:
@ -135,6 +134,7 @@ services:
depends_on: depends_on:
- plane-minio - plane-minio
# Comment this if you already have a reverse proxy running
plane-proxy: plane-proxy:
container_name: planeproxy container_name: planeproxy
build: build: