From 40fdfd29b720f73330df039579ccdef5fb6b6d27 Mon Sep 17 00:00:00 2001 From: Matt Arnold Date: Wed, 4 Jan 2023 23:15:26 -0500 Subject: Dockerless build --- Makefile | 10 +++++++++- appbuild.sh | 16 +++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) mode change 100644 => 100755 appbuild.sh diff --git a/Makefile b/Makefile index 1f3b4a5..c6be5c8 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,18 @@ build: sign docker build --no-cache . -t deepblue sign: ./sign.sh -up: sign build +up: sign docker run --net customnetwork --ip 172.42.0.2 -d deepblue --name blueproxy clean: rm -fv intercept* + rm -rfv app +nodocker: + mkdir -pv app/src + cp appbuild.sh app/src + cp intercept.* app + cd app/src + export appRoot=` realpath ../app` + ./appbuild.sh all: sign build up diff --git a/appbuild.sh b/appbuild.sh old mode 100644 new mode 100755 index 7ae04bb..f5d1702 --- a/appbuild.sh +++ b/appbuild.sh @@ -1,15 +1,21 @@ #!/bin/sh - +if [ ! -n $appRoot ] +then + export appRoot="/app" +fi +mkdir -pv $appRoot/src +cd $appRoot/src +echo $appRoot git clone https://git.piusbird.space/miniweb.git/ cd miniweb make -cp miniwebproxy /app -cp -r scripts/ /app +cp miniwebproxy $appRoot +cp -r scripts/ $appRoot chmod +x sign.sh cd .. sh -c miniweb/sign.sh git clone https://git.piusbird.space/poseidon.git/ cd poseidon go build -cp *.html /app -cp poseidon /app +cp *.html $appRoot +cp poseidon $appRoot -- cgit 1.3.0-5-g400f