github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

fix docker files

Browse Source
This commit is contained in:
Simon Larsen
2022-05-21 20:14:20 +01:00
parent caa24aa47a
commit 7b303dc6b0
7 changed files with 26 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Postgres/.env Normal file
View File

@@ -0,0 +1,2 @@
POSTGRES_USER=postgres
POSTGRES_PASSWORD=postgres

3
Samla/.env Normal file
View File

@@ -0,0 +1,3 @@
SIMPLESAMLPHP_SP_ENTITY_ID=oneuptime.com
SIMPLESAMLPHP_SP_ASSERTION_CONSUMER_SERVICE=http://localhost:3002/api/user/sso/callback
SIMPLESAMLPHP_SP_SINGLE_LOGOUT_SERVICE=http://localhost/simplesaml/module.php/saml/sp/saml2-logout.php/test-sp

0
Saml/run-server.sh → Samla/run-server.sh
View File

0
Saml/users.php → Samla/users.php
View File

16
docker-compose.ci.yml
View File

@@ -7,9 +7,8 @@ services:
postgres:
image: postgres:latest
restart: always
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
env_file:
- ./Postgres/.env
ports:
- '5400:5432'
volumes:
@@ -115,7 +114,7 @@ services:
environment:
- IS_SAAS_SERVICE=${IS_SAAS_SERVICE}
depends_on:
- dashboard-api
- identity
dashboard:
ports:
- '3000:3000'
@@ -293,13 +292,8 @@ services:
context: ./Haraka
args:
PORT: '2525'
environment:
- SMTP_USER=user@oneuptime.com
- SMTP_PASSWORD=oneuptime
- DOMAIN="${DOMAIN}"
- DKIM_PRIVATE_KEY="${DKIM_PRIVATE_KEY}"
- TLS_CERT="${TLS_CERT}"
- TLS_KEY="${TLS_KEY}"
env_file:
- ./Haraka/.env
script-runner:
ports:
- '3009:3009'

19
docker-compose.dev.yml
View File

@@ -14,20 +14,14 @@ services:
context: ./Haraka
args:
PORT: '2525'
environment:
- SMTP_USER=user@oneuptime.com
- SMTP_PASSWORD=oneuptime
- DOMAIN="${DOMAIN}"
- DKIM_PRIVATE_KEY="${DKIM_PRIVATE_KEY}"
- TLS_CERT="${TLS_CERT}"
- TLS_KEY="${TLS_KEY}"
env_file:
- ./Haraka/.env
postgres:
image: postgres:latest
restart: always
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
env_file:
- ./Postgres/.env
ports:
- '5400:5432'
volumes:
@@ -77,9 +71,13 @@ services:
context: .
dockerfile: ./Accounts/Dockerfile.dev
env_file:
- ./Common/.env
- ./CommonUI/.env
- ./Accounts/.env
environment:
- IS_SAAS_SERVICE=${IS_SAAS_SERVICE}
depends_on:
- identity
volumes:
- ./accounts:/usr/src/app
# Use node modules of the container and not host system.
@@ -266,6 +264,7 @@ services:
context: .
dockerfile: ./Identity/Dockerfile.dev
env_file:
- ./CommonServer/.env
- ./Identity/.env
environment:
- REDIS_HOST=redis

18
docker-compose.yml
View File

@@ -4,9 +4,8 @@ services:
postgres:
image: postgres:latest
restart: always
environment:
- POSTGRES_USER=postgres
- POSTGRES_PASSWORD=postgres
env_file:
- ./Postgres/.env
ports:
- '5400:5432'
volumes:
@@ -101,7 +100,8 @@ services:
environment:
- IS_SAAS_SERVICE=${IS_SAAS_SERVICE}
depends_on:
- dashboard-api
- identity
dashboard:
ports:
- '3000:3000'
@@ -247,13 +247,9 @@ services:
ports:
- '2525:2525'
image: oneuptime/haraka:latest
environment:
- SMTP_USER=user@oneuptime.com
- SMTP_PASSWORD=oneuptime
- DOMAIN="${DOMAIN}"
- DKIM_PRIVATE_KEY="${DKIM_PRIVATE_KEY}"
- TLS_CERT="${TLS_CERT}"
- TLS_KEY="${TLS_KEY}"
env_file:
- ./Haraka/.env
script-runner:
ports:
- '3009:3009'