Merge pull request #4 from bitcoincore-dev/v0.0.6

V0.0.6

Author: RandyMcMillan

Dockerfile

@@ -26,8 +26,8 @@ RUN make miniscript
 RUN echo $(date +%s) > updated
 RUN install miniscript /usr/local/bin
 RUN echo $(date +%s) > updated
-RUN make miniscript.js
-RUN echo $(date +%s) > updated
+#RUN make miniscript.js ##TODO: better buildx multiplatform building
+#RUN echo $(date +%s) > updated
 FROM make as install
 RUN install ./miniscript /usr/local/bin
 RUN echo $(date +%s) > updated

GNUmakefile

@@ -1,3 +1,15 @@
+## detect ARCH for buildx
+ARCH                                   :=$(shell uname -m)
+export ARCH
+ifeq ($(ARCH),x86_64)
+TARGET                                 :=amd64
+export TARGET
+endif
+ifeq ($(ARCH),arm64)
+TARGET                                 :=arm64
+export TARGET
+endif
+
 DOCKER=$(shell which docker)
 export DOCKER
 PWD=$(shell echo `pwd`)
@@ -16,10 +28,18 @@ install:
 	@install $(PWD)/miniscript-*      /usr/local/bin/
 
 docker:docker-miniscript## 	        docker-build
+dockerx:docker-buildx## 	        docker-buildx
 docker-build:## 		docker build -f Dockerfile -t miniscript .
 	@./miniscript-docker start
 	@$(DOCKER) pull ghcr.io/bitcoincore-dev/miniscript-docker:latest
 	@$(DOCKER) build -f Dockerfile -t miniscript .
+docker-buildx:## 		docker buildx build sequence
+	@./miniscript-docker start
+	@$(DOCKER) run --privileged --rm tonistiigi/binfmt --install all
+	@$(DOCKER) buildx ls
+	@$(DOCKER) buildx create --use --name miniscript-buildx || true
+	@$(DOCKER) buildx build -t miniscript --platform linux/arm64,linux/amd64 .
+	@$(DOCKER) buildx build -t miniscript --platform linux/$(TARGET) . --load
 docker-miniscript:docker-build## 		docker-miniscript
 	@[[ -z "$(shell file ./miniscript | grep inux)" ]] && echo "not linux" && rm ./miniscript || echo "miniscript is built for linux"
 	@$(DOCKER) run --rm -v $(PWD):/src --publish 80:8080  miniscript sh -c "make install"

README.md

@@ -53,6 +53,9 @@ docker pull ghcr.io/bitcoincore-dev/miniscript-docker:latest
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/bitcoincore-dev/miniscript-docker/master/miniscript-docker)" - serve
 ```
 
+![miniscript-docker-serve](https://github.com/bitcoincore-dev/miniscript-docker/assets/152159/75a556b2-a526-4fb0-abf7-2ffb8fb0e47a)
+
+
 <hr>
 
 Go to [the Miniscript website](http://bitcoin.sipa.be/miniscript/).

miniscript-docker

@@ -183,11 +183,10 @@ function shell (){
     docker-start
     docker \
         run \
-        -d \
         -t \
         -i \
         --rm \
-        -p 127.0.0.1:$PORT:8080/tcp \
+        -p 127.0.0.1:0:8080/tcp \
         -v `pwd`:/src miniscript bash
 
 }