diff --git a/commander b/commander index 5e6ba97..4fac4fe 100755 --- a/commander +++ b/commander @@ -129,7 +129,7 @@ case $txt in nginx=$(ps -eo lstart,args | grep nginx | grep master | grep -v grep | cut -c 5-24) svc=$(ps -eo lstart,args | grep tcpserver | grep sudo | grep -v grep | cut -c 5-24) boulder=$(ps -eo lstart,args | grep bin/boulder-wfe2 | grep -v grep | cut -c 5-24) - labca=$(ps -eo lstart,args | grep -- "-host-port 3000" | grep -v grep | head -1 | cut -c 5-24) + labca=$(ps -eo lstart,args | grep bin/labca | grep -v grep | head -1 | cut -c 5-24) echo "$timezone|$nginx|$svc|$boulder|$labca" exit 0 ;; diff --git a/patches/docker-compose.patch b/patches/docker-compose.patch index 20c80fb..394c9c3 100644 --- a/patches/docker-compose.patch +++ b/patches/docker-compose.patch @@ -1,5 +1,5 @@ diff --git a/docker-compose.yml b/docker-compose.yml -index b7e5656c5..d771aa011 100644 +index b7e5656c5..51393c181 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: @@ -19,8 +19,18 @@ index b7e5656c5..d771aa011 100644 - ./.gocache:/root/.cache/go-build:cached - ./.hierarchy:/hierarchy/:cached - ./.softhsm-tokens/:/var/lib/softhsm/tokens/:cached -@@ -38,11 +39,19 @@ services: - - 4003:4003 # OCSP +@@ -32,17 +33,25 @@ services: + # special logic there that will return multiple IP addresses for + # service names. + dns: 10.77.77.77 +- ports: +- - 4001:4001 # ACMEv2 +- - 4002:4002 # OCSP +- - 4003:4003 # OCSP ++ expose: ++ - 4001 # ACMEv2 ++ - 4002 # OCSP ++ - 4003 # OCSP depends_on: - bmysql - entrypoint: test/entrypoint.sh @@ -69,8 +79,8 @@ index b7e5656c5..d771aa011 100644 - working_dir: *boulder_working_dir - entrypoint: test/entrypoint-netaccess.sh + - /home/labca/boulder_labca:/boulder/labca -+ ports: -+ - 3000:3000 ++ expose: ++ - 3000 + depends_on: + - bmysql + working_dir: /go/src/labca