Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix/nossas image #138

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions nossas/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
nossas-org:
image: nossas/nossas-org:hotfix-adjustments
image: ${DOCKER_IMAGE:-nossas/nossas-org:feature-chakra-ui-update}
environment:
- ELASTIC_APM_ACTIVE=${ELASTIC_APM_ACTIVE:-false}
- ELASTIC_APM_SECRET_TOKEN=${ELASTIC_APM_SECRET_TOKEN:-'1111'}
Expand Down Expand Up @@ -30,39 +30,39 @@ services:
start_period: "5s"
retries: 3

nocodb:
image: nocodb/nocodb:latest
restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
volumes:
- nocodb-data:/usr/app/data
environment:
- NC_DB=pg://postgres:5432?u=${DATABASE_USER}&p=${DATABASE_PW}&d=${DATABASE_NAME}
- NC_PUBLIC_URL=https://nocodb.${DEFAULT_DOMAIN_RULE}
- NC_DISABLE_TELE=true
labels:
- traefik.enable=true
- traefik.http.services.nocodb.loadbalancer.server.port=8080
- traefik.http.routers.nocodb.tls=true
- traefik.http.routers.nocodb.tls.certresolver=myresolver
depends_on:
- postgres
# nocodb:
# image: nocodb/nocodb:latest
# restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
# volumes:
# - nocodb-data:/usr/app/data
# environment:
# - NC_DB=pg://postgres:5432?u=${DATABASE_USER}&p=${DATABASE_PW}&d=${DATABASE_NAME}
# - NC_PUBLIC_URL=https://nocodb.${DEFAULT_DOMAIN_RULE}
# - NC_DISABLE_TELE=true
# labels:
# - traefik.enable=true
# - traefik.http.services.nocodb.loadbalancer.server.port=8080
# - traefik.http.routers.nocodb.tls=true
# - traefik.http.routers.nocodb.tls.certresolver=myresolver
# depends_on:
# - postgres

postgres:
image: postgres:12.1-alpine
restart: always
environment:
POSTGRES_USER: ${DATABASE_USER}
POSTGRES_PASSWORD: ${DATABASE_PW}
POSTGRES_DB: ${DATABASE_NAME}
volumes:
- postgres:/var/lib/postgresql/data
healthcheck:
test: pg_isready -U ${DATABASE_USER} -d ${DATABASE_NAME}
interval: 10s
timeout: 2s
retries: 10
# postgres:
# image: postgres:12.1-alpine
# restart: always
# environment:
# POSTGRES_USER: ${DATABASE_USER}
# POSTGRES_PASSWORD: ${DATABASE_PW}
# POSTGRES_DB: ${DATABASE_NAME}
# volumes:
# - postgres:/var/lib/postgresql/data
# healthcheck:
# test: pg_isready -U ${DATABASE_USER} -d ${DATABASE_NAME}
# interval: 10s
# timeout: 2s
# retries: 10

networks:
default:
external:
name: nossas
name: bonde