Merge pull request #5 from neonlabsorg/fix-org-name

neonevm · Sep 18, 2024 · 1f4a412 · 1f4a412
2 parents 1190d76 + 320ae1c
commit 1f4a412
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -5,6 +5,8 @@ on:
     branches: [ "develop" ]
   pull_request:
     branches: [ "develop" ]
+env:
+  DOCKERHUB_ORG_NAME: ${{ vars.DOCKER_HUB_ORG_NAME }}
 
 jobs:
 
@@ -34,5 +36,5 @@ jobs:
         with:
           context: .
           push: true
-          tags: neonlabsorg/neon_test_programs:${{ steps.define-tag.outputs.tag }}
-          labels: neonlabsorg/neon_test_programs:${{ steps.define-tag.outputs.tag }}
+          tags:  ${{ env.DOCKERHUB_ORG_NAME }}/neon_test_programs:${{ steps.define-tag.outputs.tag }}
+          labels: ${{ env.DOCKERHUB_ORG_NAME }}/neon_test_programs:${{ steps.define-tag.outputs.tag }}
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,8 @@ FROM solanalabs/rust:1.75.0 AS builder
 RUN rustup toolchain install 1.75.0
 RUN rustup component add clippy --toolchain 1.75.0
 WORKDIR /opt
-RUN sh -c "$(curl -sSfL https://release.solana.com/beta/install)" && \
+
+RUN sh -c "$(curl -sSfL https://release.solana.com/v1.18.18/install)" && \
     /root/.local/share/solana/install/active_release/bin/sdk/sbf/scripts/install.sh
 ENV PATH=/root/.local/share/solana/install/active_release/bin:/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 RUN solana-install init 1.18.14