Commit 88113e51 authored by Mark Simpson's avatar Mark Simpson

WIP dag geth and local net

parent 5f2daac5
Pipeline #4636872 passed with stages
in 7 minutes and 18 seconds
**/bin/
**/target/
**/.idea/
**/*.iml
......
......@@ -4,3 +4,4 @@
**/.settings/
**/.classpath/
**/.project/
/bin/
......@@ -8,18 +8,14 @@
<version>1.1.1-SNAPSHOT</version>
<relativePath>../emerald-parent</relativePath>
</parent>
<artifactId>geth-docker</artifactId>
<build>
<plugins>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<executions>
<execution>
<execution>
<id>docker-start</id>
<phase>none</phase>
</execution>
......@@ -30,18 +26,22 @@
</executions>
<configuration>
<images>
<image>
<name>${project.artifactId}-nodag:${project.version}</name>
<build>
<dockerFileDir>${project.basedir}/target/docker-tmp</dockerFileDir>
</build>
</image>
<image>
<name>${project.artifactId}:${project.version}</name>
<build>
<dockerFileDir>${project.basedir}/target/docker-tmp</dockerFileDir>
<dockerFile>${project.basedir}/target/docker-tmp/DockerfileDag</dockerFile>
</build>
</image>
</images>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -18,8 +18,6 @@ RUN set -x \
RUN mkdir ~/.ethash
RUN geth makedag 0 ~/.ethash
COPY CustomGenesis.json CustomGenesis.json
COPY entrypoint.sh entrypoint.sh
......
FROM geth-docker-nodag:${project.version}
RUN geth makedag 0 ~/.ethash
ENTRYPOINT ["./entrypoint.sh"]
CMD ["geth", "--networkid", "31415926", "--rpc", "--rpcaddr", "0.0.0.0", "--rpcapi", "eth,net,web3,admin,miner,personal", "--bootnodes", "\"\""]
\ No newline at end of file
version: '2'
networks:
argent-client:
argent-testnet:
external:
name: dockercompose_argent-testnet
services:
#client stack
payment-service-argent-client:
image: emerald-payment-service:${project.version}
ports:
- 6400:4567
command: ["rabbitmq", "payment-service-argent-client", "geth-docker-argent-client:8545", "The super secret password = wibble", "4567", "5678", "http://payment-service-argent:5678/config" ]
# entrypoint: ["/usr/bin/java", "-Xdebug", "-Xrunjdwp:server=y,transport=dt_socket,address=4001,suspend=y", "-cp", "emerald-payment-service-${project.version}", "com.rbs.ie.emerald.ethereum.PaymentServiceMain"]
networks:
argent-client:
argent-testnet:
geth-docker-argent-client:
image: geth-docker:${project.version}
ports:
- 6401:30303
- 6402:8545
networks:
argent-client:
command: ["geth", "--networkid", "31415926", "--rpc", "--rpcaddr", "0.0.0.0", "--rpcapi", "eth,net,web3,admin,miner,personal", "--bootnodes", "\"\""]
#Middleware
rabbitmq-argent:
image: "rabbitmq:3-management"
restart: "unless-stopped"
ports:
- "16672:15672"
- "127.0.0.1:5672:6672"
networks:
argent-client:
......@@ -6,17 +6,17 @@ networks:
services:
geth-docker-a:
image: geth-docker:1.1.0-SNAPSHOT
image: geth-docker:${project.version}
networks:
main:
geth-docker-b:
image: geth-docker:1.1.0-SNAPSHOT
image: geth-docker:${project.version}
networks:
main:
payment-service-a:
image: emerald-payment-service:1.1.0-SNAPSHOT
image: emerald-payment-service:${project.version}
ports:
- 4567:4567
command: ["rabbitmq", "routing-key", "geth-docker-a:8545", "The super secret password = wibble", "4567", "5678"]
......@@ -24,7 +24,7 @@ services:
main:
payment-service-b:
image: emerald-payment-service:1.1.0-SNAPSHOT
image: emerald-payment-service:${project.version}
ports:
- 4568:4567
command: ["rabbitmq", "routing-key", "geth-docker-b:8545", "The super secret password = wibble", "4567", "5678", "http://payment-service-a:5678/config" ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment