fix: use espresso-bridge instead of bridge for fund-builder (#1544)

EspressoSystems · Jun 10, 2024 · 8e3c55a · 8e3c55a
2 parents 7be94b3 + 2a8ce7b
commit 8e3c55a
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -396,7 +396,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./
-          file: ./docker/bridge.Dockerfile
+          file: ./docker/espresso-bridge.Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.bridge.outputs.tags }}

diff --git a/.github/workflows/build_static.yml b/.github/workflows/build_static.yml
@@ -322,7 +322,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./
-          file: ./docker/bridge.Dockerfile
+          file: ./docker/espresso-bridge.Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.bridge.outputs.tags }}

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -50,7 +50,7 @@ services:
 
   fund-builder:
     image: ghcr.io/espressosystems/espresso-sequencer/bridge:main
-    command: bridge deposit
+    command: espresso-bridge deposit
     environment:
       - L1_PROVIDER=$ESPRESSO_SEQUENCER_L1_PROVIDER
       - ESPRESSO_PROVIDER=http://sequencer1:$ESPRESSO_SEQUENCER_API_PORT

diff --git a/docker/bridge.Dockerfile → docker/espresso-bridge.Dockerfile b/docker/bridge.Dockerfile → docker/espresso-bridge.Dockerfile
@@ -7,7 +7,9 @@ RUN apt-get update \
     &&  rm -rf /var/lib/apt/lists/*
 ENTRYPOINT ["tini", "--"]
 
-COPY target/$TARGETARCH/release/espresso-bridge /bin/bridge
-RUN chmod +x /bin/bridge
+COPY target/$TARGETARCH/release/espresso-bridge /bin/espresso-bridge
+RUN chmod +x /bin/espresso-bridge
 
-CMD [ "/bin/bridge"]
+RUN ln -s /bin/espresso-bridge /bin/bridge
+
+CMD [ "/bin/espresso-bridge"]
diff --git a/process-compose.yaml b/process-compose.yaml
@@ -46,7 +46,7 @@ processes:
         condition: process_completed
 
   fund-builder:
-    command: bridge deposit
+    command: espresso-bridge deposit
     environment:
       - L1_PROVIDER=http://localhost:$ESPRESSO_SEQUENCER_L1_PORT
       - ESPRESSO_PROVIDER=http://localhost:$ESPRESSO_SEQUENCER1_API_PORT

diff --git a/scripts/build-docker-images b/scripts/build-docker-images
@@ -61,4 +61,4 @@ docker build -t ghcr.io/espressosystems/espresso-sequencer/deploy:main -f docker
 docker build -t ghcr.io/espressosystems/espresso-sequencer/builder:main -f docker/permissionless-builder.Dockerfile ${WORKDIR}
 docker build -t ghcr.io/espressosystems/espresso-sequencer/nasty-client:main -f docker/nasty-client.Dockerfile ${WORKDIR}
 docker build -t ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main -f docker/espresso-dev-node.Dockerfile ${WORKDIR}
-docker build -t ghcr.io/espressosystems/espresso-sequencer/bridge:main -f docker/bridge.Dockerfile ${WORKDIR}
+docker build -t ghcr.io/espressosystems/espresso-sequencer/bridge:main -f docker/espresso-bridge.Dockerfile ${WORKDIR}
diff --git a/scripts/build-docker-images-native b/scripts/build-docker-images-native
@@ -117,4 +117,4 @@ docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/
 docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/builder:main -f docker/permissionless-builder.Dockerfile ${WORKDIR}
 docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/nasty-client:main -f docker/nasty-client.Dockerfile ${WORKDIR}
 docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/espresso-dev-node:main -f docker/espresso-dev-node.Dockerfile ${WORKDIR}
-docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/bridge:main -f docker/bridge.Dockerfile ${WORKDIR}
+docker build --platform $PLATFORM -t ghcr.io/espressosystems/espresso-sequencer/bridge:main -f docker/espresso-bridge.Dockerfile ${WORKDIR}