tweak ARCH to TRIPLET

Author: rsafier

README.md

@@ -48,12 +48,12 @@ cd plebnet-playground-docker
 ***
 
 ```sh
-ARCH=x86_64-linux-gnu ./install.sh   
+TRIPLET=x86_64-linux-gnu ./install.sh   
 ```
 
 ### Install and start just the `bitcoind`,`lnd` services (comma seperate them)
 ```sh
-ARCH=x86_64-linux-gnu services=bitcoind,lnd ./install.sh   
+TRIPLET=x86_64-linux-gnu services=bitcoind,lnd ./install.sh   
 ```
 
 ### Stop containers

bitcoin-signet/Dockerfile

@@ -1,7 +1,7 @@
 FROM debian:buster-slim as builder
 
 ARG BITCOIN_VERSION=22.0
-ARG ARCH=${ARCH}
+ARG TRIPLET=${TRIPLET}
 
 
 #RUN apt-add-repository ppa:bitcoin/bitcoin && apt-get update && apt-get install bitcoin
@@ -13,8 +13,8 @@ RUN  apt-get update && \
 WORKDIR /tmp
 
 # install bitcoin binaries
-RUN BITCOIN_URL="https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-${ARCH}.tar.gz" && \
-    BITCOIN_FILE="bitcoin-${BITCOIN_VERSION}-${ARCH}.tar.gz" && \
+RUN BITCOIN_URL="https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-${TRIPLET}.tar.gz" && \
+    BITCOIN_FILE="bitcoin-${BITCOIN_VERSION}-${TRIPLET}.tar.gz" && \
     BITCOIN_SHA_URL="https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS" && \
     wget -qO "${BITCOIN_FILE}" "${BITCOIN_URL}" && wget -qO SHA256SUMS.asc "${BITCOIN_SHA_URL}" && \
     grep "${BITCOIN_FILE}" SHA256SUMS.asc | sha256sum -c - && \

btcd/Dockerfile

@@ -1,4 +1,4 @@
-ARG ARCH=amd64
+ARG TRIPLET=amd64
 FROM golang:1.14-alpine3.12 AS build-container
 USER root
 ENV GO111MODULE=on
@@ -10,9 +10,9 @@ WORKDIR /root/btcd
 ARG BTCD_VERSION=63438c6d3661a7dec09013f7731035abdf1eb4bc
 RUN git fetch --all && git checkout ${BTCD_VERSION}
 RUN set -ex \
-  && if [ "${ARCH}" = "amd64" ]; then export GOARCH=amd64; fi \
-  && if [ "${ARCH}" = "arm32v7" ]; then export GOARCH=arm; fi \
-  && if [ "${ARCH}" = "arm64v8" ]; then export GOARCH=arm64; fi \
+  && if [ "${TRIPLET}" = "amd64" ]; then export GOARCH=amd64; fi \
+  && if [ "${TRIPLET}" = "arm32v7" ]; then export GOARCH=arm; fi \
+  && if [ "${TRIPLET}" = "arm64v8" ]; then export GOARCH=arm64; fi \
   && echo "Compiling for $GOARCH" \
   && go install -v . ./cmd/...
 

docker-compose.yaml.template

@@ -6,7 +6,7 @@ services:
       context: ./bitcoin-signet
       dockerfile: Dockerfile
       args:
-        - ARCH=${ARCH}
+        - TRIPLET=${TRIPLET}
     image: playground-docker-bitcoind
     links:
     - tor
@@ -15,7 +15,7 @@ services:
     restart: unless-stopped
     container_name: playground-bitcoind
     environment:
-      ARCH: ${ARCH}
+      TRIPLET: ${TRIPLET}
       GET_COINS_ON_STARTUP: 'true'
     expose:
     - "38332"
@@ -35,7 +35,7 @@ services:
     - bitcoind
     - tor
     environment:
-      ARCH: '${ARCH}'
+      TRIPLET: '${TRIPLET}'
       LND_ALIAS: 'NewNode'
       LND_LISTEN: 'playground-lnd:9735'
       LND_RPCLISTEN: 'playground-lnd:10009'
@@ -216,12 +216,12 @@ services:
     restart: unless-stopped
     container_name: playground-docs
     environment:
-      - ARCH=${ARCH}
+      - TRIPLET=${TRIPLET}
     build: 
       context: ${oc.env:PWD}/docs
       dockerfile: Dockerfile
       args:
-        - ARCH=${ARCH}
+        - TRIPLET=${TRIPLET}
     expose:
     - "8000"
     ports:

install.sh

@@ -1,19 +1,19 @@
 # if [ -z "$1" ]
 #     then 
-#     echo 'You must provide ARCH as first parameter'
+#     echo 'You must provide TRIPLET as first parameter'
 #     echo './install.sh x86_64-linux-gnu'
 #     exit;
 # fi
 
-# ARCH=$1
+# TRIPLET=$1
 
-: ${ARCH:=x86_64-linux-gnu}
+: ${TRIPLET:=x86_64-linux-gnu}
 : ${services:=Null}
 
 #Remove any old version
 docker-compose down 
 
-python plebnet_generate.py ARCH=$ARCH services=$services
+python plebnet_generate.py TRIPLET=$TRIPLET services=$services
 
 sudo rm -rf volumes
 
@@ -27,5 +27,5 @@ mkdir volumes/tor_datadir
 mkdir volumes/tor_servicesdir
 mkdir volumes/tor_torrcdir
 
-docker-compose build --build-arg ARCH=$ARCH
+docker-compose build --build-arg TRIPLET=$TRIPLET
 docker-compose up --remove-orphans -d

plebnet_generate.py

@@ -18,17 +18,17 @@
 cli_args = OmegaConf.from_cli()
 
 try:
-    arch = cli_args['ARCH']
+    triplet = cli_args['TRIPLET']
 except KeyError:
-    print('Need to supply ARCH. Supported architectures:')
+    print('Need to supply TRIPLET. Supported architectures:')
     for k, v in architectures.items():
-        print('\t{}: ARCH={}'.format(k, v))
+        print('\t{}: TRIPLET={}'.format(k, v))
     sys.exit()
 
 conf = OmegaConf.load('docker-compose.yaml.template')
 
 # merge in architecture
-conf = OmegaConf.merge(OmegaConf.create(dict(ARCH=arch)), conf)
+conf = OmegaConf.merge(OmegaConf.create(dict(TRIPLET=triplet)), conf)
 
 
 if 'services' in cli_args:
@@ -80,15 +80,15 @@ def get_services(services, required_services=set()):
         conf.services.pop(service_name)
 
 # dashboard keyword
-conf['USE_TEST_DATA'] = cli_args.get('ARCH', False)
+conf['USE_TEST_DATA'] = cli_args.get('TRIPLET', False)
 
 try:
     OmegaConf.resolve(conf)
 except:
     print(OmegaConf.to_yaml(conf))
     raise
 
-conf.pop('ARCH')
+conf.pop('TRIPLET')
 conf.pop('USE_TEST_DATA')
 
 with open('docker-compose.yaml', 'w') as f: