diff --git a/.github/actions/dockerize-neon-tests/action.yml b/.github/actions/dockerize-neon-tests/action.yml index 05bd36699c..59c6963226 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 @@ -26,7 +29,7 @@ runs: id: docker_pipeline shell: bash run: | - image_id="${{ vars.DOCKERHUB_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 }}' diff --git a/.github/workflows/basic.yml b/.github/workflows/basic.yml index c97d1b6366..cdebc54a3e 100644 --- a/.github/workflows/basic.yml +++ b/.github/workflows/basic.yml @@ -59,6 +59,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 91b4af5cb3..1742e263d0 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 5ff6a00fbc..f8e4600f5d 100644 --- a/.github/workflows/openzeppelin.yml +++ b/.github/workflows/openzeppelin.yml @@ -45,6 +45,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/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