miniscript-docker

Author: RandyMcMillan

miniscript-docker

@@ -1,9 +1,12 @@
 #!/usr/bin/env bash
 
+#rm -rf /usr/local/bin/miniscript-docker 2>/dev/null || true
 [[ -z "$(command -v miniscript-docker)" ]] && \
         install $0 /usr/local/bin || true
 
-PORT=${PORT:80}
+VERSION=${VERSION:-v0.0.2}
+
+PORT=${PORT:-80}
 VERBOSE=${VERBOSE:-	}
 
 FORCE=${FORCE:-	}
@@ -12,30 +15,16 @@ TAG=${TAG:-miniscript}
 
 PYTHON3=$(which python3)
 
-if [[ "$CI" == "" ]];
+if [[ "$(uname -s)" == "Darwin"  ]];
 then
-    if [[ "$(uname -s)" == "Darwin"  ]];
-    then
-        DOCKER=${DOCKER:-"/Applications/Docker.app/Contents/MacOS/Docker"}
-    fi
-    if [[ "$(uname -s)" == "Linux"  ]];
-    then
-        echo "TODO:more Linux support"
-        DOCKER=docker
-        DOCKER=${DOCKER:-docker}
-    fi
+    DOCKER=${DOCKER:-"/Applications/Docker.app/Contents/MacOS/Docker"}
 fi
-#[[ -z "$DOCKER" ]] && echo "-z $DOCKER" && DOCKER=${DOCKER:docker}
-#[[ ! -z "$DOCKER" ]] && echo "! -z $DOCKER" && DOCKER=${DOCKER:docker}
-#echo $DOCKER;
+## echo $DOCKER; ##exit
+## [[ -z "$DOCKER" ]] && echo "????" && DOCKER=${DOCKER:docker}
 
 ## MINT_000
 
 ## MINT_001
-MINT_001_1="thresh(2,pk(XPUB1),s:pk(XPUB2),s:pk(XPUB3),snl:older(100))"
-MINT_001_2="thresh(2,pk(XPUB1),s:pk(XPUB2),s:pk(XPUB3),snl:after(2477600))"
-MINT_001_3="thresh(2,pk(XPUB1),s:pk(XPUB2),s:pk(XPUB3),snl:after(1694563200))"
-MINT_001_4="thresh(2,pk(XPUB1),s:pk(XPUB2),s:pk(XPUB3),snl:older(4194400))"
 
 ## MINT_002
 MINT_002_1="thresh(3,pk(XPUB1),s:pk(XPUB2),s:pk(XPUB3),s:pk(XPUB4),s:pk(XPUB5),snu:older(100),snu:older(200))"
@@ -60,7 +49,7 @@ function docker-start(){
 	    fi;\
 	    if [[ "$(uname -s)" == "Darwin" ]]; then\
             DOCKER="/Applications/Docker.app/Contents/MacOS/Docker";\
-            open --background -a $DOCKER || DOCKER=$(which docker);\
+	     open --background -a $DOCKER;\
 	    fi;\
 	sleep 1;\
 	done\
@@ -84,19 +73,6 @@ and(pk(A),or(pk(B),or(9@pk(C),older(1000))))
 printf "
 and(pk(A),or(pk(B),or(9@pk(C),older(1000))))
 "
-
-printf "
-$MINT_001_1
-"
-printf "
-$MINT_001_2
-"
-printf "
-$MINT_001_3
-"
-printf "
-$MINT_001_4
-"
 printf "
 $MINT_002_1
 "
@@ -127,52 +103,49 @@ function help {
     printf "  miniscript-docker examples\n"
     printf "\n"
     printf "  miniscript-docker help  [-h --help]\n"
-    printf "\n"
     printf "  miniscript-docker build [-b --build]\n"
     printf "\n"
-    printf "  miniscript-docker shell\n"
-    printf "\n"
-    printf "  miniscript-docker serve\n"
-    printf "\n"
     printf "  miniscript-docker run '<miniscript>'"
     printf "\n"
     exit;
 }
 
 function build(){
 
+    docker \
+        build \
+        https://raw.githubusercontent.com/bitcoincore-dev/miniscript-docker/$VERSION/Dockerfile \
+        $NOCACHE \
+        -t $TAG
+
     #echo $DOCKER
     #echo $NOCACHE
-    [ "$NOCACHE" ]      && docker build --no-cache -t $TAG . && exit;
-    [ ! -z "$NOCACHE" ] && docker build $NOCACHE   -t $TAG . && exit;
+    #[ "$NOCACHE" ]      && $(which docker) build --no-cache -t $TAG . && exit;
+    #[ ! -z "$NOCACHE" ] && $(which docker) build $NOCACHE   -t $TAG . && exit;
 
 }
 
 function run(){
 
     docker-start
-
+    echo $2
     docker \
         run \
         --rm \
         -v $PWD:/src \
         $TAG \
         sh \
-        -c "echo '$1' | miniscript";
-
-exit
-}
-function serve(){
-
-    docker-start
+        -c "echo '$2' | ./miniscript-run"; exit;
 
+    ## echo $1
     docker \
         run \
-        -t \
-        -i \
         --rm \
-        -p 127.0.0.1:$PORT:8080/tcp \
-        -v `pwd`:/src miniscript serve
+        -v $PWD:/src \
+        $TAG \
+        sh \
+        -c "echo '$1' | miniscript";
+    echo $2
 
 }
 function shell (){
@@ -185,7 +158,6 @@ function shell (){
         --rm \
         -p 127.0.0.1:$PORT:8080/tcp \
         -v `pwd`:/src miniscript bash
-
 }
 ## argparse
 ## position $1
@@ -227,8 +199,6 @@ do
             ;;
         run) RUN=TRUE && run $2 $3 $4
             ;;
-        serve) serve
-            ;;
         shell) shell
             ;;
         examples) examples