github-personal/labca
1
0
Fork 0
mirror of https://github.com/outbackdingo/labca.git synced 2026-01-27 10:19:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump boulder version to release-2023-06-12

Browse Source
This commit is contained in:
Arjan H
2023-06-13 18:46:42 +02:00
parent 66b51217df
commit d7f4c10fd9
10 changed files with 42 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
build/tmp.patch
View File

@@ -1,5 +1,5 @@
diff --git a/docker-compose.yml b/docker-compose.yml
index 4fe5b4749..e70a007ef 100644
index e63e560cd..676d94ada 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,9 @@
@@ -38,10 +38,10 @@ index 4fe5b4749..e70a007ef 100644
entrypoint: labca/entrypoint.sh
working_dir: &boulder_working_dir /opt/boulder
logging:
@@ -74,30 +74,32 @@ services:
@@ -74,8 +74,10 @@ services:
bconsul:
image: hashicorp/consul:1.13.1
image: hashicorp/consul:1.14.2
+ depends_on:
+ - control
volumes:
@@ -50,6 +50,10 @@ index 4fe5b4749..e70a007ef 100644
networks:
consulnet:
ipv4_address: 10.55.55.10
@@ -83,25 +85,24 @@ services:
ipv4_address: 10.77.77.10
rednet:
ipv4_address: 10.88.88.10
- command: "consul agent -dev -config-format=hcl -config-file=/test/consul/config.hcl"
+ command: "consul agent -dev -config-format=hcl -config-file=/opt/boulder/labca/consul/config.hcl"
@@ -68,7 +72,6 @@ index 4fe5b4749..e70a007ef 100644
+ - ldata:/opt/labca/data
+ - nginx_html:/opt/wwwstatic
+ - backup:/opt/backup
+ #- .:/boulder
+ - boulder_data:/opt/boulder/labca
expose:
- 3000
@@ -82,7 +85,7 @@ index 4fe5b4749..e70a007ef 100644
logging:
driver: "json-file"
options:
@@ -114,37 +116,45 @@ services:
@@ -118,37 +119,45 @@ services:
- 80:80
- 443:443
volumes: