Use dockerhub sawtooth images

build/docker-compose.yml

@@ -15,12 +15,6 @@
 version: '3.4'
 
 services:
-  sawtooth:
-    build:
-      context: ..
-      dockerfile: docker/sawtooth.dockerfile
-    image: remme/sawtooth:latest
-
   remme-build:
     build:
       context: ..

build/release.sh

@@ -6,13 +6,15 @@ RELEASE_NUMBER=$(git describe --abbrev=0 --tags)
 COMPOSE_DIR=./docker/compose
 RELEASE_DIR=./remme-core-$RELEASE_NUMBER-release
 COMPOSE_RELEASE_DIR=$RELEASE_DIR/docker/compose
+SCRIPTS_RELEASE_DIR=$RELEASE_DIR/scripts/node
 
 mkdir -p $RELEASE_DIR
 mkdir -p $COMPOSE_RELEASE_DIR
 
 cp $COMPOSE_DIR/base.yml ./$COMPOSE_RELEASE_DIR
 cp $COMPOSE_DIR/genesis.yml ./$COMPOSE_RELEASE_DIR
 cp -R config ./$RELEASE_DIR
+cp -R ./scripts/node $SCRIPTS_RELEASE_DIR
 cp ./scripts/run.sh ./$RELEASE_DIR
 
 for IMAGE in $IMAGES; do

docker/compose/base.yml

@@ -18,7 +18,7 @@ version: '3.4'
 services:
   validator:
     container_name: remme_validator
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-validator:1.1.4
     hostname: remme.validator
     volumes:
       - validator_keys:/etc/sawtooth/keys
@@ -28,6 +28,7 @@ services:
       - ../../config/seeds-list.txt:/config/seeds-list.txt
       - ../../config/log/validator.toml:/etc/sawtooth/log_config.toml
       - ../../config/network-config.env:/config/network-config.env
+      - ../../scripts/node:/scripts
       - logs:/var/log/remme
     network_mode: bridge
     ports:
@@ -50,7 +51,7 @@ services:
 
   validator-rest-api:
     container_name: remme_validator_rest_api
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-rest-api:1.1.4
     network_mode: "service:validator"
     volumes:
       - ../../config/log/validator-rest-api.toml:/etc/sawtooth/rest_api_log_config.toml
@@ -59,7 +60,7 @@ services:
 
   block-info-tp:
     container_name: remme_block_info_tp
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-block-info-tp:1.1.4
     network_mode: "service:validator"
     volumes:
       - ../../config/log/block-info-tp.toml:/etc/sawtooth/block_info_log_config.toml
@@ -68,7 +69,7 @@ services:
 
   settings-tp:
     container_name: remme_settings_tp
-    image: remme/sawtooth:latest
+    image: hyperledger/sawtooth-settings-tp:1.1.4
     network_mode: "service:validator"
     entrypoint: settings-tp -vv -C tcp://127.0.0.1:4004
     volumes:

docker/compose/development-genesis.yml

@@ -19,4 +19,4 @@ services:
   remme-genesis:
     volumes:
       - ./../../:/project/remme
-    entrypoint: sh -c "make build_protobuf && /project/remme/scripts/node/genesis.sh"
+    entrypoint: sh /project/remme/scripts/node/genesis.sh

docker/compose/development.yml

@@ -19,9 +19,9 @@ services:
   remme-tp:
     volumes:
       - ./../../:/project/remme
-    entrypoint: sh -c "make build_protobuf && python3 -m remme.tp"
+    entrypoint: python3 -m remme.tp
 
   remme-rpc-api:
     volumes:
       - ./../../:/project/remme
-    entrypoint: sh -c "make build_protobuf && python3 -m remme.rpc_api"
+    entrypoint: python3 -m remme.rpc_api