Merge pull request Overclock-Validator#3 from segfaultdoc/seg/revert-…

…docker-build revert building in docker
buffalu · Mar 20, 2023 · ad0fb78 · ad0fb78
2 parents 84e7d8b + a7f526c
commit ad0fb78
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/roles/common/tasks/user.yaml b/roles/common/tasks/user.yaml
@@ -19,4 +19,4 @@
   become_user: root
   lineinfile:
     path: /home/solana/.bashrc
-    line: 'export PATH=/mnt/{{ repo_dir }}/docker-output:$PATH'
+    line: 'export PATH=/mnt/{{ repo_dir }}/target/release:$PATH'
diff --git a/roles/jito/tasks/build.yaml b/roles/jito/tasks/build.yaml
@@ -1,7 +1,7 @@
 - name: build solana
   become: true
   become_user: root
-  shell: "git config --global --add safe.directory /mnt/{{ repo_dir }} && cd /mnt/{{ repo_dir }} && ./f"
+  shell: "cd /mnt/{{ repo_dir }} && ./cargo stable build --release"
   args:
     chdir: "/mnt/{{ repo_dir }}"
     executable: /bin/bash
diff --git a/roles/jito/tasks/key_management.yaml b/roles/jito/tasks/key_management.yaml
@@ -30,20 +30,20 @@
 - name: get and store the id key
   become: true
   become_user: solana
-  shell: "/mnt/{{ repo_dir }}/docker-output/solana address -k /home/solana/.keys/validator_id.json"
+  shell: "/mnt/{{ repo_dir }}/target/release/solana address -k /home/solana/.keys/validator_id.json"
   register: id_key
 
 - name: get and store the vote key
   become: true
   become_user: solana
-  shell: "/mnt/{{ repo_dir }}/docker-output/solana address -k /home/solana/.keys/validator_vote.json"
+  shell: "/mnt/{{ repo_dir }}/target/release/solana address -k /home/solana/.keys/validator_vote.json"
   register: vote_key
 
 - name: verify vote account created
   become: true
   become_user: solana
   shell: |
-    /mnt/{{ repo_dir }}/docker-output/solana vote-account /home/solana/.keys/validator_vote.json -u {{ rpc_address }} | grep -e Identity | awk '{print $3}'
+    /mnt/{{ repo_dir }}/target/release/solana vote-account /home/solana/.keys/validator_vote.json -u {{ rpc_address }} | grep -e Identity | awk '{print $3}'
   register: vote_identity
 
 - name: debug

diff --git a/roles/jito/templates/validator.sh.j2 b/roles/jito/templates/validator.sh.j2
@@ -2,7 +2,7 @@
 {% if metrics %}
   {% if cluster == "mainnet" %}
     export SOLANA_METRICS_CONFIG="host=https://metrics.solana.com:8086,db=mainnet,u=mainnet-beta_write,p=password"
-    exec /mnt/{{ repo_dir }}/docker-output/solana-validator --identity /home/solana/.keys/validator_id.json \
+    exec /mnt/{{ repo_dir }}/target/release/solana-validator --identity /home/solana/.keys/validator_id.json \
       --rpc-port 8899 \
       --entrypoint entrypoint.mainnet-beta.solana.com:8001 \
       --entrypoint entrypoint2.mainnet-beta.solana.com:8001 \
@@ -27,7 +27,7 @@
       --shred-receiver-address {{ jito_shred_receiver_address }}
   {% else %}
     export SOLANA_METRICS_CONFIG="host=https://metrics.solana.com:8086,db=testnet,u=testnet_write,p=password"
-    exec /mnt/{{ repo_dir }}/docker-output/solana-validator --identity /home/solana/.keys/validator_id.json \
+    exec /mnt/{{ repo_dir }}/target/release/solana-validator --identity /home/solana/.keys/validator_id.json \
       --rpc-port 8899 \
       --entrypoint entrypoint.testnet.solana.sergo.dev:8001 \
       --entrypoint entrypoint.testnet.solana.com:8001 \