From ac31421dde611713e2fcd941c08fe4a91203ca7a Mon Sep 17 00:00:00 2001 From: Kristina Nikolaeva Date: Fri, 22 Nov 2024 15:06:39 +0100 Subject: [PATCH] added devnet_solana_url --- .github/workflows/deploy.py | 4 +++- .github/workflows/pipeline.yml | 1 + Dockerfile | 12 ++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/deploy.py b/.github/workflows/deploy.py index d949c89b5..12c95f9f0 100644 --- a/.github/workflows/deploy.py +++ b/.github/workflows/deploy.py @@ -30,6 +30,7 @@ DOCKER_USER = os.environ.get("DHUBU") DOCKER_PASSWORD = os.environ.get("DHUBP") +DEVNET_SOLANA_URL = os.environ.get("DEVNET_SOLANA_URL") IMAGE_NAME = os.environ.get("IMAGE_NAME", "evm_loader") RUN_LINK_REPO = os.environ.get("RUN_LINK_REPO") DOCKERHUB_ORG_NAME = os.environ.get("DOCKERHUB_ORG_NAME") @@ -126,7 +127,8 @@ def build_docker_image(evm_sha_tag): buildargs = {"REVISION": evm_sha_tag, "SOLANA_IMAGE": solana_image, "SOLANA_BPF_VERSION": SOLANA_BPF_VERSION, - "DOCKERHUB_ORG_NAME": DOCKERHUB_ORG_NAME} + "DOCKERHUB_ORG_NAME": DOCKERHUB_ORG_NAME, + "DEVNET_SOLANA_URL": DEVNET_SOLANA_URL} tag = f"{DOCKERHUB_ORG_NAME}/{IMAGE_NAME}:{evm_sha_tag}" click.echo("start build") diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index fe74ff0dd..2a8b80cf5 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -14,6 +14,7 @@ on: env: DHUBU: ${{secrets.DHUBU}} DHUBP: ${{secrets.DHUBP}} + DEVNET_SOLANA_URL: ${{secrets.DEVNET_SOLANA_URL}} PROXY_ENDPOINT: "https://api.github.com/repos/${{ github.repository_owner }}/neon-proxy.py" NEON_TESTS_ENDPOINT: ${{vars.NEON_TESTS_ENDPOINT}} DOCKERHUB_ORG_NAME: ${{vars.DOCKERHUB_ORG_NAME}} diff --git a/Dockerfile b/Dockerfile index e01ab9fe5..4bf4276fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,13 +36,13 @@ FROM ${DOCKERHUB_ORG_NAME}/neon_test_programs:latest AS neon_test_programs # Define solana-image that contains utility FROM builder AS base - +ARG DEVNET_SOLANA_URL RUN solana program dump metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s /opt/metaplex.so --url mainnet-beta -RUN solana account 7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE --output-file pyth_sol.json --output json-compact --url mainnet-beta -RUN solana account F2VfCymdNQiCa8Vyg5E7BwEv9UPwfm8cVN6eqQLqXiGo --output-file pyth_neon.json --output json-compact --url mainnet-beta -RUN solana account 42amVS4KgzR9rA28tkVYqVXjq9Qa8dcZQMbH5EYFX6XC --output-file pyth_eth.json --output json-compact --url mainnet-beta -RUN solana account Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX --output-file pyth_usdc.json --output json-compact --url mainnet-beta -RUN solana account HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM --output-file pyth_usdt.json --output json-compact --url mainnet-beta +RUN solana account 7UVimffxr9ow1uXYxsr4LHAcV58mLzhmwaeKvJ1pjLiE --output-file pyth_sol.json --output json-compact --url ${DEVNET_SOLANA_URL} +RUN solana account F2VfCymdNQiCa8Vyg5E7BwEv9UPwfm8cVN6eqQLqXiGo --output-file pyth_neon.json --output json-compact --url ${DEVNET_SOLANA_URL} +RUN solana account 42amVS4KgzR9rA28tkVYqVXjq9Qa8dcZQMbH5EYFX6XC --output-file pyth_eth.json --output json-compact --url ${DEVNET_SOLANA_URL} +RUN solana account Dpw1EAVrSB1ibxiDQyTAW6Zip3J4Btk2x4SgApQCeFbX --output-file pyth_usdc.json --output json-compact --url ${DEVNET_SOLANA_URL} +RUN solana account HT2PLQBcG5EiCcNSaMHAjSgd9F98ecpATbk4Sk5oYuM --output-file pyth_usdt.json --output json-compact --url ${DEVNET_SOLANA_URL}