From c487c176c4ae5812c96e2f59869b1467bf736835 Mon Sep 17 00:00:00 2001 From: kristinaNikolaeva Date: Fri, 1 Dec 2023 15:32:32 +0100 Subject: [PATCH 1/4] fix dockerize --- .github/actions/dockerize-neon-tests/action.yml | 6 +++++- .github/workflows/basic.yml | 1 + .github/workflows/economy.yml | 1 + .github/workflows/openzeppelin.yml | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/actions/dockerize-neon-tests/action.yml b/.github/actions/dockerize-neon-tests/action.yml index 5aa0143966..d6580c8712 100644 --- a/.github/actions/dockerize-neon-tests/action.yml +++ b/.github/actions/dockerize-neon-tests/action.yml @@ -4,6 +4,9 @@ inputs: image_tag: # id of input description: 'neon tests image tag' required: true + org_name: + description: 'docker hub organization name' + required: true oz_branch: description: 'branch name for oz tests' required: true @@ -22,7 +25,7 @@ runs: id: docker_pipeline shell: bash run: | - image_id="neonlabsorg/neon_tests" + image_id="${{ inputs.org_name }}/neon_tests" delimeter=$(printf "%0.s-" {1..30}) echo " ${delimeter} Build new docker image ${image_id} ${delimeter}" docker build . --tag ${image_id}:${{ inputs.image_tag }} --build-arg OZ_BRANCH='${{ inputs.oz_branch }}' @@ -30,3 +33,4 @@ runs: echo "${{ inputs.docker_password }}" | docker login -u ${{ inputs.docker_username }} --password-stdin echo "${delimeter} Push image ${image_id} to Docker registry ${delimeter}" docker push --all-tags ${image_id} + diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index d96ba8ec57..dced202624 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -55,6 +55,7 @@ jobs: uses: ./.github/actions/dockerize-neon-tests with: image_tag: ${{ github.sha }} + org_name: ${{ vars.DOCKERHUB_ORG_NAME }} docker_username: ${{ secrets.DOCKER_USERNAME }} docker_password: ${{ secrets.DOCKER_PASSWORD }} prepare-env: diff --git a/.github/workflows/economy.yml b/.github/workflows/economy.yml index 05b3575a64..f0d0d4e462 100644 --- a/.github/workflows/economy.yml +++ b/.github/workflows/economy.yml @@ -39,6 +39,7 @@ jobs: id: requirements uses: ./.github/actions/dockerize-neon-tests with: + org_name: ${{ vars.DOCKERHUB_ORG_NAME }} image_tag: ${{ github.sha }} docker_username: ${{ secrets.DOCKER_USERNAME }} docker_password: ${{ secrets.DOCKER_PASSWORD }} diff --git a/.github/workflows/openzeppelin.yml b/.github/workflows/openzeppelin.yml index 29d65b667c..7a3bfab2c0 100644 --- a/.github/workflows/openzeppelin.yml +++ b/.github/workflows/openzeppelin.yml @@ -46,6 +46,7 @@ jobs: uses: ./.github/actions/dockerize-neon-tests with: image_tag: ${{ github.sha }} + org_name: ${{ vars.DOCKERHUB_ORG_NAME }} docker_username: ${{ secrets.DOCKER_USERNAME }} docker_password: ${{ secrets.DOCKER_PASSWORD }} prepare-env: From 586f8bc912446c22d2bf6ba28a4de456e1ed1d24 Mon Sep 17 00:00:00 2001 From: kristinaNikolaeva Date: Fri, 1 Dec 2023 15:35:23 +0100 Subject: [PATCH 2/4] Update action.yml --- .github/actions/dockerize-neon-tests/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dockerize-neon-tests/action.yml b/.github/actions/dockerize-neon-tests/action.yml index 293707434c..ce16148823 100644 --- a/.github/actions/dockerize-neon-tests/action.yml +++ b/.github/actions/dockerize-neon-tests/action.yml @@ -29,7 +29,7 @@ runs: id: docker_pipeline shell: bash run: | - image_id="${{ vars.DOCKERHUB_ORG_NAME }}/neon_tests" + image_id="${{ org_name }}/neon_tests" delimeter=$(printf "%0.s-" {1..30}) echo " ${delimeter} Build new docker image ${image_id} ${delimeter}" docker build . --no-cache --tag ${image_id}:${{ inputs.image_tag }} --build-arg OZ_BRANCH='${{ inputs.oz_branch }}' From 38b62d993c085fe1f0e10fa1f8909da135e6e473 Mon Sep 17 00:00:00 2001 From: kristinaNikolaeva Date: Fri, 1 Dec 2023 15:36:15 +0100 Subject: [PATCH 3/4] Update action.yml --- .github/actions/dockerize-neon-tests/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/dockerize-neon-tests/action.yml b/.github/actions/dockerize-neon-tests/action.yml index ce16148823..59c6963226 100644 --- a/.github/actions/dockerize-neon-tests/action.yml +++ b/.github/actions/dockerize-neon-tests/action.yml @@ -29,7 +29,7 @@ runs: id: docker_pipeline shell: bash run: | - image_id="${{ org_name }}/neon_tests" + image_id="${{ inputs.org_name }}/neon_tests" delimeter=$(printf "%0.s-" {1..30}) echo " ${delimeter} Build new docker image ${image_id} ${delimeter}" docker build . --no-cache --tag ${image_id}:${{ inputs.image_tag }} --build-arg OZ_BRANCH='${{ inputs.oz_branch }}' From d885c424897dd9898449dba1aa40f914307b0637 Mon Sep 17 00:00:00 2001 From: kristinaNikolaeva Date: Fri, 1 Dec 2023 15:53:08 +0100 Subject: [PATCH 4/4] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3d9f9a96e7..e6e4f3ef81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,6 +77,7 @@ RUN mkdir -p ${DOWNLOAD_PATH} && \ chmod -R 755 ${DOWNLOAD_PATH} COPY deploy/infra/compile_contracts.sh compatibility/openzeppelin-contracts +RUN chmod +x compatibility/openzeppelin-contracts/compile_contracts.sh RUN cd compatibility/openzeppelin-contracts npm set audit false RUN cd compatibility/openzeppelin-contracts && npm ci RUN cd compatibility/openzeppelin-contracts && ./compile_contracts.sh \ No newline at end of file