#40 Clean Up Clippy Warnings & Docker

Dockerfile

@@ -3,6 +3,7 @@ ARG SOLANA_REVISION=v1.9.12-testnet-with_trx_cap
 FROM solanalabs/rust:latest AS builder
 RUN rustup toolchain install stable
 RUN rustup component add clippy --toolchain stable
+RUN cargo install spl-token-cli
 WORKDIR /opt
 RUN sh -c "$(curl -sSfL https://release.solana.com/stable/install)" && \
     /root/.local/share/solana/install/active_release/bin/sdk/bpf/scripts/install.sh
@@ -26,11 +27,13 @@ FROM neonlabsorg/solana:${SOLANA_REVISION} AS solana
 FROM ubuntu:20.04 AS base
 WORKDIR /opt
 
+RUN apt-get update -y
+RUN apt-get install -y libssl-dev
+
 COPY --from=solana /opt/solana/bin/solana /opt/solana/bin/solana-keygen /opt/solana/bin/
-COPY --from=governance-builder /opt/neon-governance/solana-program-library/target/deploy/*.so /opt/
-COPY --from=governance-builder /opt/neon-governance/target/deploy/*.so /opt/
-COPY context/spl-token /opt/solana/bin/
-COPY context/libssl.so.1.1 context/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/
+COPY --from=governance-builder /usr/local/cargo/bin/spl-token /opt/solana/bin/
+COPY --from=governance-builder /opt/neon-governance/solana-program-library/target/deploy/*.so /opt/deploy/
+COPY --from=governance-builder /opt/neon-governance/target/deploy/*.so /opt/deploy/
 COPY artifacts/creator.keypair /root/.config/solana/id.json
 COPY artifacts/*.keypair /opt/artifacts/
 COPY artifacts/voters/*.keypair /opt/artifacts/voters/

init-governance.sh

@@ -1,19 +1,19 @@
 #!/bin/bash
-solana -v --url http://localhost:8899 --keypair /opt/artifacts/creator.keypair airdrop 100
-solana -v --url http://localhost:8899 --keypair /opt/artifacts/payer.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair artifacts/creator.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair artifacts/payer.keypair airdrop 100
 
-solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter1.keypair airdrop 100
-solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter2.keypair airdrop 100
-solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter3.keypair airdrop 100
-solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter4.keypair airdrop 100
-solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter5.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair artifacts/voters/voter1.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair artifacts/voters/voter2.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair artifacts/voters/voter3.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair artifacts/voters/voter4.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair artifacts/voters/voter5.keypair airdrop 100
 
-spl-token --url http://localhost:8899 create-token --decimals 6 --fee-payer /opt/artifacts/payer.keypair /opt/artifacts/community-mint.keypair
+spl-token --url http://localhost:8899 create-token --decimals 6 --fee-payer artifacts/payer.keypair artifacts/community-mint.keypair
 
-solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/spl-governance.keypair -v /opt/spl_governance.so
+solana program deploy --url http://localhost:8899 --program-id artifacts/spl-governance.keypair -v deploy/spl_governance.so
 
-solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/addin-fixed-weights.keypair -v /opt/spl_governance_addin_fixed_weights.so
+solana program deploy --url http://localhost:8899 --program-id artifacts/addin-fixed-weights.keypair -v deploy/spl_governance_addin_fixed_weights.so
 
-solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/addin-vesting.keypair -v /opt/spl_governance_addin_vesting.so
+solana program deploy --url http://localhost:8899 --program-id artifacts/addin-vesting.keypair -v deploy/spl_governance_addin_vesting.so
 
-solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/maintenance.keypair -v /opt/maintenance.so
+solana program deploy --url http://localhost:8899 --program-id artifacts/maintenance.keypair -v deploy/maintenance.so