From 10050f0c273d7ac4941a4081e5b23e19380c2da9 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Tue, 29 Apr 2025 23:43:54 +1200
Subject: [PATCH] All working.

---
 .../{dropshell_alpine => }/Dockerfile.build   |   2 +-
 .../_create_dropshell.sh                      |   0
 docker/builld_builder.sh                      |   8 +++++
 .../{dropshell_alpine/build.sh => compile.sh} |   8 ++---
 docker/dropshell_alpine/Dockerfile.run        |  29 ------------------
 docker/dropshell_alpine/example.sh            |  13 --------
 docker/dropshell_alpine/publish.sh            |   3 --
 .../output/dropshell_aarch64                  | Bin 4350688 -> 4350688 bytes
 .../output/dropshell_x86_64                   | Bin 4523592 -> 4523592 bytes
 docker/publish_builder.sh                     |   3 ++
 10 files changed, 16 insertions(+), 50 deletions(-)
 rename docker/{dropshell_alpine => }/Dockerfile.build (86%)
 rename docker/{dropshell_alpine => }/_create_dropshell.sh (100%)
 mode change 100644 => 100755
 create mode 100755 docker/builld_builder.sh
 rename docker/{dropshell_alpine/build.sh => compile.sh} (83%)
 delete mode 100644 docker/dropshell_alpine/Dockerfile.run
 delete mode 100755 docker/dropshell_alpine/example.sh
 delete mode 100755 docker/dropshell_alpine/publish.sh
 rename docker/{dropshell_alpine => }/output/dropshell_aarch64 (99%)
 rename docker/{dropshell_alpine => }/output/dropshell_x86_64 (99%)
 create mode 100755 docker/publish_builder.sh

diff --git a/docker/dropshell_alpine/Dockerfile.build b/docker/Dockerfile.build
similarity index 86%
rename from docker/dropshell_alpine/Dockerfile.build
rename to docker/Dockerfile.build
index 61a6c75..fb2a79f 100644
--- a/docker/dropshell_alpine/Dockerfile.build
+++ b/docker/Dockerfile.build
@@ -14,7 +14,7 @@ WORKDIR /app
 
 COPY . .
 
-COPY --chmod=755 docker/dropshell_alpine/_create_dropshell.sh /scripts/
+COPY --chmod=755 docker/_create_dropshell.sh /scripts/
 
 RUN rm -rf build
 
diff --git a/docker/dropshell_alpine/_create_dropshell.sh b/docker/_create_dropshell.sh
old mode 100644
new mode 100755
similarity index 100%
rename from docker/dropshell_alpine/_create_dropshell.sh
rename to docker/_create_dropshell.sh
diff --git a/docker/builld_builder.sh b/docker/builld_builder.sh
new file mode 100755
index 0000000..8442104
--- /dev/null
+++ b/docker/builld_builder.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+ROOT_DIR=$(dirname $SCRIPT_DIR)
+
+docker build -t gitea.jde.nz/j/dropshell_builder:latest $ROOT_DIR -f $SCRIPT_DIR/Dockerfile.build
+
diff --git a/docker/dropshell_alpine/build.sh b/docker/compile.sh
similarity index 83%
rename from docker/dropshell_alpine/build.sh
rename to docker/compile.sh
index 71ec1ee..6167ec2 100755
--- a/docker/dropshell_alpine/build.sh
+++ b/docker/compile.sh
@@ -2,12 +2,12 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-ROOT_DIR=$(dirname $(dirname $SCRIPT_DIR))
+ROOT_DIR=$(dirname $SCRIPT_DIR)
 
 echo "Building dropshell from $ROOT_DIR"
 
 # Build the builder image
-docker build -t dropshell_alpine_builder $ROOT_DIR -f $SCRIPT_DIR/Dockerfile.build
+#docker build -t dropshell_alpine_builder $ROOT_DIR -f $SCRIPT_DIR/Dockerfile.build
 
 rm -rf $SCRIPT_DIR/output
 mkdir -p $SCRIPT_DIR/output
@@ -22,7 +22,7 @@ docker run --rm -tt --env CHOWN_USER=$MYUID --env CHOWN_GROUP=$MYGID \
     -e TARGET_ARCH=x86_64 \
     -e CC=gcc \
     -e CXX=g++ \
-    dropshell_alpine_builder
+    gitea.jde.nz/j/dropshell_builder:latest
 
 mv $SCRIPT_DIR/output/dropshell $SCRIPT_DIR/output/dropshell_x86_64
 
@@ -38,7 +38,7 @@ docker run --rm -tt --env CHOWN_USER=$MYUID --env CHOWN_GROUP=$MYGID \
     -e TARGET_ARCH=aarch64 \
     -e CC=aarch64-linux-gnu-gcc \
     -e CXX=aarch64-linux-gnu-g++ \
-    dropshell_alpine_builder
+    gitea.jde.nz/j/dropshell_builder:latest
 
 mv $SCRIPT_DIR/output/dropshell $SCRIPT_DIR/output/dropshell_aarch64
 
diff --git a/docker/dropshell_alpine/Dockerfile.run b/docker/dropshell_alpine/Dockerfile.run
deleted file mode 100644
index bb540db..0000000
--- a/docker/dropshell_alpine/Dockerfile.run
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM --platform=$BUILDPLATFORM alpine:latest AS builder
-
-RUN apk add --no-cache \
-    bash \
-    nano
-
-WORKDIR /app
-
-COPY docker/dropshell_alpine/output/dropshell /app/dropshell
-RUN /bin/bash -c "mkdir -p /opt/dropshell/templates && mkdir -p /config"
-COPY templates /opt/dropshell/templates
-COPY src/dropshell-completion.bash /etc/bash_completion.d/
-
-FROM alpine:latest
-
-RUN apk add --no-cache \
-    bash \
-    nano
-
-WORKDIR /app
-
-COPY --from=builder /app/dropshell /app/dropshell
-COPY --from=builder /opt/dropshell/templates /opt/dropshell/templates
-COPY --from=builder /etc/bash_completion.d/dropshell-completion.bash /etc/bash_completion.d/
-
-RUN /app/dropshell init /config
-RUN /app/dropshell version
-
-ENTRYPOINT ["/app/dropshell"]
diff --git a/docker/dropshell_alpine/example.sh b/docker/dropshell_alpine/example.sh
deleted file mode 100755
index cbb0356..0000000
--- a/docker/dropshell_alpine/example.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [ $# -lt 1 ]; then
-	echo "	Use: example <dir>"
-	exit 0	
-fi
-
-
-(
-cd "$1"
-echo ZG9ja2VyIHJ1biAtdHQgLS1ybSAtdi46L3ggZ2l0ZWEuamRlLm56L2ovZHJvcHNoZWxsX2FscGluZSBoYXNoIC94 | base64 -d | bash
-)
-
diff --git a/docker/dropshell_alpine/publish.sh b/docker/dropshell_alpine/publish.sh
deleted file mode 100755
index 3745cc2..0000000
--- a/docker/dropshell_alpine/publish.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker push gitea.jde.nz/j/dropshell_alpine:latest
diff --git a/docker/dropshell_alpine/output/dropshell_aarch64 b/docker/output/dropshell_aarch64
similarity index 99%
rename from docker/dropshell_alpine/output/dropshell_aarch64
rename to docker/output/dropshell_aarch64
index 517b52a321cf9690d0eddc54d3be3696f0575733..94cda3f48fbcd9313a642e494ca12f2c1facc16f 100755
GIT binary patch
delta 310
zcmWm7OLD;g0D$31P>-r-D5+-%(W0~-t$KuwEVv3s=)xl77H-fkGJ|CoJx5KqPGFPq
zXYsAS)9+S1;d>`Y`ugYZxH1%RamjzG=Xv%^J8Ue$v;>C;7u@jR2448!M*z17;tnB%
z5kV9&#33PpB<_(ydT$A`u@F12roEK$fDE$8A&&xzP*6e{Dk`W#Lk*93LLCh>@r)MQ
ec!BeD&_xe@yx|=Kd|-$X#+X3IbZ;+b|I!r&<b{v`

delta 310
zcmWm7J5Is?0D$4NC?XaVtb*ks6%bT>K;;c0CL|1Y@dBKIGdMI}fW^hdouNq+HU?G}
zCbotnkTAC4@9@o^z4#GrO#cM=YxOV92fylU?CgBK(PX`Jw%?{;n1V-y4+l7eA4dq_
z7(tvsLI`1;;tUZ)aSj<5xI_$bTv?`|3_nG!YPh<B1d>Q0jca6};s#mdkjE_wDB=$H
nct8n{c)~MYP(}qBUg3Q;)X_i_Ews@=7jNj{9evByKQ{6n3Q>ql

diff --git a/docker/dropshell_alpine/output/dropshell_x86_64 b/docker/output/dropshell_x86_64
similarity index 99%
rename from docker/dropshell_alpine/output/dropshell_x86_64
rename to docker/output/dropshell_x86_64
index c2acdd1643086a992162b1e7a56efb14b66ba5b7..9e7ef5441bb05006e5a0b0236a36e2543d204aad 100755
GIT binary patch
delta 2007
zcma))c~BHb6vp?>g7kPGk>wKD1q5e74VNgF5zq)$Oi+vRh{m8oSq4N!jYkd)Vyz~c
ziUxct>MkOMmIy>mwHnKSqJmoSAczSbTml}HM~oK&c_Xu!GL@J=e)HAWulx1a-BZ3U
zQz$2jZ3Ina;v!SR-DCBgeFh}OJ^L(b?9&YU1D-;90R*qgFEr#A0?#iLIz1td=T{23
z5)||I+JwxHz?s)hQ6E?Wb1?H4^#-Wo1JA1$J3>6qZdRuX&}y*0ttKo8OKyF;M^Gnl
zKKho`H#IN_FO;z`;a=0GGt3daPO@QO#OWv538+E0Q>++#@Zu?!0zdJH(=1&Og6r{O
z85@Aj70dx%U}pu3g#wH{!*&bmI&?q9wqe#;W(yN>&snxYsJ?-br<ogn_Z&;HfM|a3
z0$T)7iTX>d9D4Exmso%rs=4Q7d3ZK%uBPFweC8E4LxeCasiSC}6)&UN)l;-099K`#
z?x0NrMGM8!28wo;`!&kZVor8Nt8Subz42ZXMLUWkn<<)YSy!~xEfj4QZfT)t&Bwc<
z1>ItW7T~}eTjdP7IOQH?_?^4om!swLxIg6KKrDYm!=LaCf3h|UNWt~bSt_(`YGb)D
zneUPX4q!|>n+(&?)XuWuXCB_c7FfUsxK9vM<=a$?xiFlUsm02dN3|3uLod8<DQ3fb
zzOILOE)#a*)NFA+1YkwBcwWxAjod>Nw~Iv(g@?D3yM*35$a&yzJIL+Fu|}~-5PIWt
zqnH94ajuDq_2`sC#Z+9ILv5((PIA<AC)Lt%c`mtrcq^A2ZLy2oLxY$n5<Q7tL~o)G
zVNLWUY>2nGnAeY&K&YWK(UzAcYBq*KKE|0ezOa;Mm^2gnf+toNX=-5<KUA!VvKCaW
z{KYX%nmwfP&#N?6H({wE<A@#4IAY&_1WY#=pV$))gd;aTacaK{Gx+w#{$m2<x3G8q
zbpb^2!v^PyFj&S{op5gThOha;R_Cg4IEc|cE@NOGe(U2B4PJOzmTO!)$fachJmOYg
zxJ0?z{?Mm~DrRlz>dqx|B3A~hV%FOk`ScwwHFMzv4`!}2JRpIik893yIL<?Mx!M5~
z@Yp=pAJy=fTkdhqx&!f;ovHm0Eb(!sHVi5-AWJ(Brg2l2HoPZj`8A_<SwG0*llE)B
zoB#u{O08Q8h5UUB-5E7Bpd-`Ggs=Dtrt_K&(+s909XBPp1%fa%&`_1^M!55;WRIeE
zEQ3@kl^;f4m7?+7UXO8@T;MUDClq)L6%3|A4`Kk}Nq7+hxv5YpAFR&UI}4L)q#<M1
z?43pHRjTAWUHYBkH!EsVbho0#iXKw5MA34rtC4)oeZ4UFs<aX=VB}W4gtb?t5~nN5
z#OsQ7m=#N#CEfSMz_9k36ye`JZmz#cal&;eP3&GK+i1LhUGl^6H>Az43jDzhsR*DE
zbLu2rNca3VwO8sdFNr=K{8^n84d8~64N`REGo>7Q)DPq-ZHjMKwDUD@-WCeFu6r4;
zXpn{r-d7ZFuK%mbx8;BlO;W_vmjAm($<TcS#sB9XT`v+(FXE)x*Om1j^IyH(%4R77
z+GYQ7npT;<M$toxhAJAP=p;oG6g9U`ea)N4&HAZQU!mwzMT7lk$|vN;7HPv4Sj7F)
z^;QBb#*hqsEIh%r8TvVJ6CY&geZhshuhu)*{q5hN|1=+<L;hcN7?G`K+-93T-U2!d
z3r%{$oA4n95rc^##M^`~;Yaur0Yo4%ln5e*5yOdKB7_Jf!iaEU1n~|rl87K8i6~+e
KUuYU#o%k0N$knU>

delta 2003
zcma)+2~1R16ox%-SnhK{D#Iqr0D^D8g-s9yVNfgDTG7@NHB_<28U?AMwpFVV9XoMN
zY{8=)gh4Q9MIhDYsx?+BD5y~sky=zhl*JWmEfqw1o;<KIv38Pg{`}|Mcklo1y)&g-
zQiW2Y&{|M$&JD!W#N<2vp}|8oty&cM#j)l3L!QFAJQ%S)H{Xz(4?H(t==6jsJhwu~
zmLQM6-!7zn0`|Oiy6Vt!n2V_wRNLVaAAC`@%mL!Ku~C&QK(oQ>u8J@t%(>NFi=a+8
z#K$#TZmtFi%Zpi<aIay<S>}LVB`g?>7+1nhK^3~4W`!^qFP&ydz`5=WTPFx3ZsDb3
zHV7Nbm_7WBon<Tr_F>FfwomA+MfcMz9n;P+8<>py&#{$4MGZ!sVQ&20^DM~>#`44E
zY$?D+)Lv$#V8I_>W&tXw;GS3I@@(8$MdclQ&Tnj%2qW=i9Yt#|dl}947DYRNlWtM8
zMzpS{Xu()iPtneBzuR)OaV1^Rsv0O7!$%Di?FdFTQndcXUC}l)QM6gOtBIo3|JoHT
zsF~%PfepX?K+cef(;rcWtK7Xsj+V`*J(0`4So$ZGKjYh<vUW3Ah+ErOGPLe!XW8%(
z&yfWRa6$)*g;+FoFeCiT!(Xt)X7C;!6vSkCH&tRb1oC2)Sn={z&Ba)-#1?bW2nl?P
zg?K&{GH`}b{2Yd3nNhqb=S(N}5XIeM0Yu=@-Q+HycLq6Eyp};OA17vt1;UFy*p?|K
z!8TlAqUKF>%%WxzZp@--Xwp68Xwp5@TZ1dI$ys4@HaS`%hulMhxK|{46McxjL_flc
z=ucP^?{IPN0DcmJ4Mp>8c+oudx1%5%r<v5gu$1df>JR&a8&(ylYax;!DO8WK5}x1Z
z&rhh=+QBORb*0+!4lFh3kJ)nlF}s1IVY(r+)sC<y9C&7{W5<1%$#>r#I6go=3p=MP
ziy?v^H8_=p!7{%7l+y!m_=Yce;8Yn7g&6JQJRTO{HXr9`aL22%T;r}ooSUXX3%6YD
zJjUJTU_Xmq6E+rY=v+QODkY@Xgsrwl9+%-<y#RjUA<Si#2gGyqamiW%CwOR%i!H!D
z9<$fwCl&m`&G);c-GewZrn=4qz`s&m!=MBM(p(ooEH|aOhWCbn{6?nhR|6o6fBd8C
znyKJ{l`74b@B{zAOmkKRHR!-Jb6_=J$uwSbA=Y3@&~Q_NTObI5L59jiH^QA)CVCV^
zfFDL(m!h%!fX5{6mgkWo;EYYdeGNJJ9>gHRlkg%2^PGICc&O@1Vmu~POT#AW4}987
z{v_V((k+TlRWx1E97XdKJ*?<)MT@bnTJr6l*9$|gODS+3qrTTlSbJSM>3BsM_`9NQ
z-HJtxlIFWY`nlEKkaYe%_3r-L6sO*l)`~rk$u=5WZc2VQrAFHMs=*)ENCg13m{lif
zLVL!)ZF;5ua+Bz*jX$fCq5&K*s$PnYdaATX9rpuyNUP$XDcb&;?_Rb;sW0Yb_0mYe
zyF9OJ`@8#ZRC%}TQP&{pX4L-QXOy*iUP1ByxklHC#M6m5_C5H9Y_Co(rBTwsGuh8x
zYo`oPQM6Fe07Z3*PF6Hd(e5}4U-RAdZcS49$%?ip8sa}kenXzwByHbC|A+qTw3Y%S
zVyIpl15a?HUOOLd;A6ek7u4K+gVx^mUw4D<X)ZvUd|x%FGin*PPS?hpL7QQTNlSPW
zKEx1WC^3u}PWTdjgg+5L1QH{NAR?F;NrVug#3&++2q#7p5kw@RBcg~g#8|$>G_Gpi
EKid%07XSbN

diff --git a/docker/publish_builder.sh b/docker/publish_builder.sh
new file mode 100755
index 0000000..4bfb0ef
--- /dev/null
+++ b/docker/publish_builder.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker push gitea.jde.nz/j/dropshell_builder:latest