Put Control binary in same location on all machines, in /bin/svr{2,3}…

…control.
signalapp · Oct 2, 2024 · 8ce76d1 · 8ce76d1
1 parent 2af3948
commit 8ce76d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -140,8 +140,8 @@ RUN apt-get update && apt-get install -y \
     libcurl4
 COPY host/main /bin/svr2
 COPY enclave/releases/sgx /enclaves
-COPY host/cmd/control/control /bin/svr2control
-RUN ln -s /bin/svr2control /bin/svr3control
+COPY host/cmd/control/control /bin/svr3control
+RUN ln -s /bin/svr3control /bin/svr2control
 
 ENTRYPOINT ["/bin/svr2"]
 
@@ -188,4 +188,6 @@ COPY docker/nitro_start.sh nitro_start.sh
 RUN mkdir /releases
 COPY enclave/releases/nitro/* /releases
 COPY host/main /bin/svr2
+COPY host/cmd/control/control /bin/svr3control
+RUN ln -s /bin/svr3control /bin/svr2control
 ENTRYPOINT ["./nitro_start.sh"]
diff --git a/trustedimage/gcp.sh b/trustedimage/gcp.sh
@@ -25,6 +25,7 @@ function rm_blob() {
 }
 trap rm_blob EXIT
 $GCLOUD storage cp ../host/main gs://$GCP_BUCKET/svr3-$VERSION
+$GCLOUD storage cp ../host/cmd/control/control gs://$GCP_BUCKET/svr3control-$VERSION
 tar --transform="s/$(basename $FROM)/disk.raw/" --format=oldgnu -cvf - -C $(dirname $FROM) $(basename $FROM) | pigz >gcp.tar.gz
 if [ -z "$GCP_JUMPHOST" ]; then
   $GCLOUD storage cp ./gcp.tar.gz $BLOB