4.3 deployment scripts were unintentionally broken on the real customer-replica branch, so moving the fix into this repo. (#3)

Author: coury-clark

pure-docker/deploy-caddy.sh

@@ -10,6 +10,7 @@ source ./replicas.sh
 
 docker network create sourcegraph &>/dev/null || true
 
+./deploy-apache.sh
 ./deploy-node-exporter.sh
 ./deploy-cadvisor.sh
 ./deploy-github-proxy.sh
@@ -47,5 +48,4 @@ while [ "$(docker inspect sourcegraph-frontend-internal --format '{{.State.Healt
 done
 
 for i in $(seq 0 $(($NUM_FRONTEND - 1))); do ./deploy-frontend.sh $i; done
-./deploy-caddy.sh
 wait

pure-docker/deploy.sh

@@ -6,9 +6,9 @@ cd "$root_dir"
 
 source ./replicas.sh
 
+docker rm -f apache &>/dev/null || true &
 docker rm -f node-exporter &>/dev/null || true &
 docker rm -f cadvisor &> /dev/null || true &
-docker rm -f caddy    &> /dev/null || true &
 docker rm -f sourcegraph-frontend-internal &> /dev/null || true &
 docker rm -f $(addresses "sourcegraph-frontend-" $NUM_FRONTEND "") &> /dev/null || true &
 docker rm -f github-proxy &> /dev/null || true &