From e448ce0fbf727cb42e98511536969c8393699f5a Mon Sep 17 00:00:00 2001
From: Kristina Nikolaeva
 <112946046+kristinaNikolaevaa@users.noreply.github.com>
Date: Wed, 18 Sep 2024 11:52:28 +0200
Subject: [PATCH] Removed org name (#544)

* Update pipeline.yml

* removed org name

* Update Dockerfile

* Update Dockerfile
---
 .github/workflows/deploy.py    | 3 ++-
 .github/workflows/pipeline.yml | 4 ++--
 Dockerfile                     | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.py b/.github/workflows/deploy.py
index 40f5a5d7e..57ba46acc 100644
--- a/.github/workflows/deploy.py
+++ b/.github/workflows/deploy.py
@@ -124,7 +124,8 @@ def build_docker_image(evm_sha_tag):
     docker_client.pull(solana_image)
     buildargs = {"REVISION": evm_sha_tag,
                  "SOLANA_IMAGE": solana_image,
-                 "SOLANA_BPF_VERSION": SOLANA_BPF_VERSION}
+                 "SOLANA_BPF_VERSION": SOLANA_BPF_VERSION,
+                 "DOCKERHUB_ORG_NAME": DOCKERHUB_ORG_NAME}
 
     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 ccc528447..76a33b5b9 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -13,10 +13,10 @@ on:
 env:
   DHUBU: ${{secrets.DHUBU}}
   DHUBP: ${{secrets.DHUBP}}
-  PROXY_ENDPOINT: "https://api.github.com/repos/neonlabsorg/neon-proxy.py"
+  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}}
-  RUN_LINK_REPO: "neonlabsorg/neon-proxy.py"
+  RUN_LINK_REPO: "${{ github.repository_owner }}/neon-proxy.py"
   BUILD_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
 
 concurrency:
diff --git a/Dockerfile b/Dockerfile
index b82ac9665..9799084e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
 ARG SOLANA_IMAGE
+ARG DOCKERHUB_ORG_NAME
 # Install BPF SDK
 FROM solanalabs/rust:1.75.0 AS builder
 RUN cargo install rustfilt
@@ -31,7 +32,7 @@ RUN cargo fmt --check && \
 
 
 # Add neon_test_invoke_program to the genesis
-FROM neonlabsorg/neon_test_programs:latest AS neon_test_programs
+FROM ${DOCKERHUB_ORG_NAME}/neon_test_programs:latest AS neon_test_programs
 
 # Define solana-image that contains utility
 FROM builder AS base