Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 2 additions & 6 deletions docker-compose2.0/docker-compose.firewall.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
services:
core:
image: ghcr.io/defguard/defguard:dev
image: ghcr.io/defguard/defguard:2.0.0-beta2
environment:
DEFGUARD_COOKIE_INSECURE: "true"
DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
DEFGUARD_AUTH_SECRET: defguard-auth-secret
DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
DEFGUARD_DB_HOST: db
DEFGUARD_DB_PORT: 5432
DEFGUARD_DB_USER: defguard
Expand All @@ -25,7 +21,7 @@ services:
- default

edge1:
image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
volumes:
- ./.volumes/certs2.0/edge1:/etc/defguard/certs
ports:
Expand Down
14 changes: 5 additions & 9 deletions docker-compose2.0/docker-compose.ha.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
services:
core:
image: ghcr.io/defguard/defguard:2.0.0-alpha2
image: ghcr.io/defguard/defguard:2.0.0-beta2
environment:
DEFGUARD_COOKIE_INSECURE: "true"
DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
DEFGUARD_AUTH_SECRET: defguard-auth-secret
DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
DEFGUARD_DB_HOST: db
DEFGUARD_DB_PORT: 5432
DEFGUARD_DB_USER: defguard
Expand All @@ -22,12 +18,12 @@ services:
- "8000:8000"

edge1:
image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
volumes:
- ./.volumes/certs2.0-ha/edge1:/etc/defguard/certs

edge2:
image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
volumes:
- ./.volumes/certs2.0-ha/edge2:/etc/defguard/certs

Expand All @@ -42,7 +38,7 @@ services:
- ./nginx/edge.conf:/etc/nginx/conf.d/default.conf:ro

gateway1:
image: ghcr.io/defguard/gateway:2.0.0-alpha2
image: ghcr.io/defguard/gateway:2.0.0-beta2
cap_add:
- NET_ADMIN
volumes:
Expand All @@ -52,7 +48,7 @@ services:
HEALTH_PORT: 55003

gateway2:
image: ghcr.io/defguard/gateway:2.0.0-alpha2
image: ghcr.io/defguard/gateway:2.0.0-beta2
cap_add:
- NET_ADMIN
volumes:
Expand Down
13 changes: 5 additions & 8 deletions docker-compose2.0/docker-compose.ldap.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
services:
core:
image: ghcr.io/defguard/defguard:dev
image: ghcr.io/defguard/defguard:2.0.0-beta2
environment:
DEFGUARD_COOKIE_INSECURE: "true"
DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
DEFGUARD_AUTH_SECRET: defguard-auth-secret
DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
DEFGUARD_DB_HOST: db
DEFGUARD_DB_PORT: 5432
DEFGUARD_DB_USER: defguard
Expand All @@ -22,7 +18,7 @@ services:
- "8000:8000"

edge1:
image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
volumes:
- ./.volumes/certs2.0/edge1:/etc/defguard/certs
ports:
Expand All @@ -31,7 +27,7 @@ services:
- "443:443"

gateway1:
image: ghcr.io/defguard/gateway:2.0.0-alpha2
image: ghcr.io/defguard/gateway:2.0.0-beta2
cap_add:
- NET_ADMIN
volumes:
Expand Down Expand Up @@ -78,7 +74,8 @@ services:
depends_on:
- openldap
environment:
PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'openldap': [{'server': [{'host': 'openldap', 'port': 1389}]}]}]"
PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'openldap': [{'server': [{'host':
'openldap', 'port': 1389}]}]}]"
PHPLDAPADMIN_HTTPS: "false"
ports:
- "8081:80"
10 changes: 3 additions & 7 deletions docker-compose2.0/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
services:
core:
image: ghcr.io/defguard/defguard:2.0.0-alpha2
image: ghcr.io/defguard/defguard:2.0.0-beta2
environment:
DEFGUARD_COOKIE_INSECURE: "true"
DEFGUARD_SECRET_KEY: defguard-secret-key-defguard-secret-key-defguard-secret-key-defguard-secret-key
DEFGUARD_AUTH_SECRET: defguard-auth-secret
DEFGUARD_GATEWAY_SECRET: defguard-gateway-secret
DEFGUARD_YUBIBRIDGE_SECRET: defguard-yubibridge-secret
DEFGUARD_DB_HOST: db
DEFGUARD_DB_PORT: 5432
DEFGUARD_DB_USER: defguard
Expand All @@ -22,7 +18,7 @@ services:
- "8000:8000"

edge1:
image: ghcr.io/defguard/defguard-proxy:2.0.0-alpha2
image: ghcr.io/defguard/defguard-proxy:2.0.0-beta2
volumes:
- ./.volumes/certs2.0/edge1:/etc/defguard/certs
ports:
Expand All @@ -31,7 +27,7 @@ services:
- "443:443"

gateway1:
image: ghcr.io/defguard/gateway:2.0.0-alpha2
image: ghcr.io/defguard/gateway:2.0.0-beta2
cap_add:
- NET_ADMIN
volumes:
Expand Down
1 change: 0 additions & 1 deletion docker-compose2.0/ldap/entrypoint/set_access.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@ olcAccess: to *
by * read
EOF


ldap_stop
Loading