Swap docker-compose.yml patches for easier development

hakwerk · Mar 31, 2022 · 8f97390 · 8f97390
1 parent 7736780
commit 8f97390
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 19 deletions.
diff --git a/install b/install
@@ -534,10 +534,10 @@ config_boulder() {
     msg_info "$msg"
 
     cd "$boulderDir"
-    sudo -u labca -H patch -p1 < $cloneDir/patches/docker-compose.patch &>>$installLog
     if [ "$flag_skip_redis" == true ]; then
         sudo -u labca -H patch -p1 < $cloneDir/patches/docker-compose-redis.patch &>>$installLog
     fi
+    sudo -u labca -H patch -p1 < $cloneDir/patches/docker-compose.patch &>>$installLog
     cp docker-compose.yml "$boulderLabCADir/.backup/"
 
     sudo -u labca -H patch -p1 < $cloneDir/patches/cmd_shell.patch &>>$installLog

diff --git a/patches/docker-compose-redis.patch b/patches/docker-compose-redis.patch
@@ -1,8 +1,8 @@
 diff --git a/docker-compose.yml b/docker-compose.yml
-index e88f7c19f..d771aa011 100644
+index b0c235a91..b7e5656c5 100644
 --- a/docker-compose.yml
 +++ b/docker-compose.yml
-@@ -26,8 +26,6 @@ services:
+@@ -25,8 +25,6 @@ services:
          ipv4_address: 10.77.77.77
        rednet:
          ipv4_address: 10.88.88.88
@@ -11,17 +11,17 @@ index e88f7c19f..d771aa011 100644
      # Use sd-test-srv as a backup to Docker's embedded DNS server
      # (https://docs.docker.com/config/containers/container-networking/#dns-services).
      # If there's a name Docker's DNS server doesn't know about, it will
-@@ -41,7 +39,6 @@ services:
+@@ -40,7 +38,6 @@ services:
        - 4003:4003 # OCSP
      depends_on:
        - bmysql
 -      - bredis_clusterer
-     entrypoint: labca/entrypoint.sh
+     entrypoint: test/entrypoint.sh
      working_dir: &boulder_working_dir /boulder
+
+@@ -61,78 +58,6 @@ services:
      logging:
-@@ -74,78 +71,6 @@ services:
-         max-file: "5"
-     restart: always
+         driver: none
 
 -  bredis_1:
 -    image: redis:latest
@@ -96,9 +96,9 @@ index e88f7c19f..d771aa011 100644
 -          aliases:
 -            - boulder-redis-clusterer
 
-   labca:
+   netaccess:
      image: *boulder_image
-@@ -186,10 +111,3 @@ networks:
+@@ -160,10 +85,3 @@ networks:
        driver: default
        config:
          - subnet: 10.88.88.0/24

diff --git 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 b0c235a91..d72c08883 100644
+index b7e5656c5..d771aa011 100644
 --- a/docker-compose.yml
 +++ b/docker-compose.yml
 @@ -8,7 +8,7 @@ services:
@@ -19,10 +19,10 @@ index b0c235a91..d72c08883 100644
        - ./.gocache:/root/.cache/go-build:cached
        - ./.hierarchy:/hierarchy/:cached
        - ./.softhsm-tokens/:/var/lib/softhsm/tokens/:cached
-@@ -41,11 +42,19 @@ services:
+@@ -38,11 +39,19 @@ services:
+       - 4003:4003 # OCSP
      depends_on:
        - bmysql
-       - bredis_clusterer
 -    entrypoint: test/entrypoint.sh
 +    entrypoint: labca/entrypoint.sh
      working_dir: &boulder_working_dir /boulder
@@ -40,7 +40,7 @@ index b0c235a91..d72c08883 100644
      networks:
        bluenet:
          aliases:
-@@ -59,7 +68,11 @@ services:
+@@ -56,21 +65,38 @@ services:
      # small.
      command: mysqld --bind-address=0.0.0.0 --slow-query-log --log-output=TABLE --log-queries-not-using-indexes=ON
      logging:
@@ -51,11 +51,6 @@ index b0c235a91..d72c08883 100644
 +        max-file: "5"
 +    restart: always
 
-   bredis_1:
-     image: redis:latest
-@@ -134,18 +147,31 @@ services:
-           aliases:
-             - boulder-redis-clusterer
 
 -  netaccess:
 +  labca: