Use docker image and add make targets

Makefile

@@ -230,6 +230,10 @@ install-zetae2e: go.sum
 	@go install -mod=readonly $(BUILD_FLAGS) ./cmd/zetae2e
 .PHONY: install-zetae2e
 
+solana:
+	@echo "Building solana docker image"
+	$(DOCKER) build -t solana-local -f contrib/localnet/solana/Dockerfile contrib/localnet/solana/
+
 start-e2e-test: zetanode
 	@echo "--> Starting e2e test"
 	cd contrib/localnet/ && $(DOCKER) compose up -d
@@ -254,6 +258,11 @@ start-stress-test: zetanode
 	@echo "--> Starting stress test"
 	cd contrib/localnet/ && $(DOCKER) compose --profile stress -f docker-compose.yml up -d
 
+start-solana-test: zetanode solana
+	@echo "--> Starting solana test"
+	export E2E_ARGS="--test-solana" && \
+	cd contrib/localnet/ && $(DOCKER) compose --profile solana -f docker-compose.yml up -d
+
 ###############################################################################
 ###                         Upgrade Tests              						###
 ###############################################################################

contrib/localnet/docker-compose.yml

@@ -184,14 +184,16 @@ services:
     image: solana-local:latest
     container_name: solana
     hostname: solana
+    profiles:
+      - solana
+      - all
     ports:
       - "8899:8899"
     networks:
       mynetwork:
         ipv4_address: 172.20.0.102
     entrypoint: [ "/usr/bin/start-solana.sh" ]
 
-
   eth:
     image: ethereum/client-go:v1.10.26
     container_name: eth

contrib/localnet/solana/Dockerfile

@@ -0,0 +1,12 @@
+FROM ghcr.io/zeta-chain/solana-docker:1.18.15
+
+WORKDIR /data
+COPY ./start-solana.sh /usr/bin/start-solana.sh
+RUN chmod +x /usr/bin/start-solana.sh
+COPY ./gateway.so .
+COPY ./gateway-keypair.json .
+
+
+
+ENTRYPOINT [ "bash" ]
+CMD [ "/usr/bin/start-solana.sh" ]