From bc59f06a0ec79d25072b45f4707a3e89107459f8 Mon Sep 17 00:00:00 2001 From: Nenad Milosevic Date: Sun, 9 Feb 2025 18:24:52 +0100 Subject: [PATCH] only terraform --- .github/workflows/qa.yml | 12 ++++++------ qa/docker/Dockerfile | 2 +- qa/terraform/templates/commands.tmpl | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index cd63f1af6..32a60f588 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -13,8 +13,8 @@ jobs: TF_VAR_do_token: "${{ secrets.DO_TOKEN }}" TF_VAR_ssh_keys: '["${{ secrets.DO_SSH_FINGERPRINT }}"]' TF_VAR_nyc1: 1 - TF_VAR_nyc3: 0 - TF_VAR_fra1: 0 + TF_VAR_nyc3: 1 + TF_VAR_fra1: 1 steps: - name: Checkout code @@ -39,10 +39,10 @@ jobs: working-directory: qa/terraform run: terraform apply -auto-approve - - name: Setup commands - working-directory: qa/terraform - run: | - source commands.sh && deploy_cc + #- name: Setup commands + # working-directory: qa/terraform + # run: | + # source commands.sh && deploy_cc - name: Terraform Destroy (Cleanup Nodes) if: always() diff --git a/qa/docker/Dockerfile b/qa/docker/Dockerfile index 5ba4785fd..c2f3c1943 100644 --- a/qa/docker/Dockerfile +++ b/qa/docker/Dockerfile @@ -7,6 +7,6 @@ RUN --mount=type=bind,from=code,target=/mnt cargo build --release --target-dir / FROM debian:bookworm-slim RUN apt-get update && apt-get install -y iproute2 -COPY --from=builder /tmp/release/malachite-cli /usr/local/bin/malachite-cli +COPY --from=builder /tmp/release/informalsystems-malachitebft-starknet-app /usr/local/bin/malachite-cli COPY --chmod=755 entrypoint.sh /usr/bin/entrypoint.sh ENTRYPOINT ["/usr/bin/entrypoint.sh"] diff --git a/qa/terraform/templates/commands.tmpl b/qa/terraform/templates/commands.tmpl index 6bee2a86b..7edd9d271 100644 --- a/qa/terraform/templates/commands.tmpl +++ b/qa/terraform/templates/commands.tmpl @@ -121,10 +121,10 @@ ok_cc() { deploy_cc() { test -d "$MALACHITE_DIR/code" || (echo "Source code repository not found. Clone or copy manually." && return 1) if _is_cc; then - docker build --push -t cc.testnet/node --build-context "code=$MALACHITE_DIR/code" "$MALACHITE_DIR/qa/docker" + docker build --output=type=registry -t cc.testnet/node --build-context "code=$MALACHITE_DIR/code" "$MALACHITE_DIR/qa/docker" else _keyscan_cc 2> /dev/null # Needed for docker -H - docker -H ssh://root@$CANDC build --push -t cc.testnet/node --build-context "code=$MALACHITE_DIR/code" "$MALACHITE_DIR/qa/docker" + docker -H ssh://root@$CANDC build --output=type=registry -t cc.testnet/node --build-context "code=$MALACHITE_DIR/code" "$MALACHITE_DIR/qa/docker" fi }