Skip to content

Commit 2ab10fd

Browse files
author
colinlyguo
committed
fix
1 parent 3f92adb commit 2ab10fd

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

.github/workflows/docker.yml

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -311,21 +311,10 @@ jobs:
311311
uses: webfactory/[email protected]
312312
with:
313313
ssh-private-key: ${{ secrets.OPENVM_GPU_SSH_PRIVATE_KEY }}
314-
- name: Setup SSH config
314+
- name: Run custom script
315315
run: |
316-
mkdir -p ~/.ssh
317-
echo "Host github.com" > ~/.ssh/config
318-
echo " User git" >> ~/.ssh/config
319-
echo " IdentityFile ~/.ssh/id_rsa" >> ~/.ssh/config
320-
echo " StrictHostKeyChecking no" >> ~/.ssh/config
321-
chmod 600 ~/.ssh/config
322-
- name: Setup Cargo config
323-
run: |
324-
mkdir -p ~/.cargo
325-
echo '[net]' > ~/.cargo/config.toml
326-
echo 'git-fetch-with-cli = true' >> ~/.cargo/config.toml
327-
- name: Debug SSH agent
328-
run: ssh-add -l
316+
chmod +x build/dockerfiles/coordinator-api/init-openvm.sh
317+
build/dockerfiles/coordinator-api/init-openvm.sh
329318
- name: Build and push
330319
uses: docker/build-push-action@v3
331320
env:
@@ -336,7 +325,6 @@ jobs:
336325
context: .
337326
file: ./build/dockerfiles/coordinator-api.Dockerfile
338327
push: true
339-
ssh: default
340328
build-args: |
341329
CARGO_NET_GIT_FETCH_WITH_CLI=true
342330
tags: |

build/dockerfiles/coordinator-api.Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,17 @@ RUN cargo chef prepare --recipe-path recipe.json
99
FROM chef as zkp-builder
1010
COPY ./common/libzkp/impl/rust-toolchain ./
1111
COPY --from=planner /app/recipe.json recipe.json
12+
# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-gpu
13+
COPY ./build/dockerfiles/coordinator-api/openvm-gpu /openvm-gpu
14+
COPY ./build/dockerfiles/coordinator-api/gitconfig /root/.gitconfig
15+
COPY ./build/dockerfiles/coordinator-api/config.toml /root/.cargo/config.toml
1216
RUN cargo chef cook --release --recipe-path recipe.json
1317

18+
# local patch for openvm
19+
# run ./build/dockerfiles/coordinator-api/init-openvm.sh to get openvm-gpu
20+
COPY ./build/dockerfiles/coordinator-api/openvm-gpu /openvm-gpu
21+
COPY ./build/dockerfiles/coordinator-api/gitconfig /root/.gitconfig
22+
COPY ./build/dockerfiles/coordinator-api/config.toml /root/.cargo/config.toml
1423
COPY ./common/libzkp/impl .
1524
RUN cargo build --release
1625

0 commit comments

Comments
 (0)