reorganize src/ for refactor of UCI build

reorganize, refactor and improve testing

build

@@ -10,10 +10,10 @@ if [[ $build ]];then
     if [[ $BUILD_CADDY_CONF ]]; then
         CONF_DIR=${CONF_DIR:-${PWD}/conf}
         if [[ -d $CONF_DIR ]]; then
-            mkdir -p ${BUILD_SRC}/init/caddy/conf
+            mkdir -p ${BUILD_SRC}/init/opt/caddy/conf
             echo adding caddy conf/ directory $CONF_DIR to build
             ls -la $CONF_DIR
-            /bin/cp -R $CONF_DIR/. ${BUILD_SRC}/init/caddy/conf 
+            /bin/cp -R $CONF_DIR/. ${BUILD_SRC}/init/opt/caddy/conf 
         fi
     fi
     BUILD_PKGS=${BUILD_PKGS:-${PWD}/caddy.pkgs}

src/init/build.env

@@ -1,3 +1,2 @@
-source $ENV_DIR/run.env
+export BUILD_NAME=caddy
-export ENTRYPOINT_CMD=caddy
+[ -f "$ENV_DIR/run.env" ] && source $ENV_DIR/run.env
-export ENTRYPOINT_CMD_PATH=$BIN_DIR/caddy

src/init/init.sh

@@ -1,16 +1,11 @@
 #!/bin/bash
-# set -e
 echo -e "********** Caddy Setup and Install ***************"
 if [[ $(env | grep CADDY_LIB) ]]; then
-    mkdir -p $CADDY_HOME 2> /dev/null 
+    mkdir -p $CADDY_HOME >/dev/null
-    if [[ -d caddy/ ]]; then
+    pushd $CADDY_HOME > /dev/null || exit 2
-        echo "copying caddy/ to $CADDY_HOME"
-        /bin/cp -R -p caddy/. $CADDY_HOME
-    fi
-    pushd $CADDY_HOME || exit 2
     echo making caddy subdirectories $PWD
     mkdir data conf settings bin 2> /dev/null 
-    popd 
+    popd > /dev/null || exit 2
     chown -R 1000:1000 $CADDY_HOME
     echo -e "------------------"
     echo $CADDY_HOME 

src/init/opt/bin/caddy

@@ -40,6 +40,7 @@ case "$1" in
    conf=Caddyfile
   fi
   if [[ -f $conf ]]; then
+    echo checking for any run time packages to add...
     caddy_add_packages
     echo running: $CADDY_BIN run --config $conf --adapter caddyfile
     $CADDY_BIN run --config $conf --adapter caddyfile

src/init/opt/env/run.env

@@ -1,3 +1,6 @@
 # will be sourced when "login" action is run via /etc/profile
+# set these to customize the "custom" entrypoint command
+export ENTRYPOINT_CMD=caddy
+export ENTRYPOINT_CMD_PATH=$BIN_DIR/caddy
 source $ENV_DIR/caddy.env
 export VOLUME_DIRS="$XDG_CONFIG_HOME $XDG_DATA_HOME $CADDY_CONF"

src/init/opt/lib/caddy.lib

@@ -13,7 +13,7 @@ caddy_add_packages () {
     
   }
   [[ -f $1 ]] && pkgs=" $(clean $1)"
-  [[ $BUILDING && -f $BUILD_DIR/caddy.pkgs ]] && pkgs=$(clean $BUILD_DIR/caddy.pkgs "$pkgs")
+  [[ $BUILDING && -f $BUILD_DIR/caddy.pkgs ]] && pkgs=$(clean $BUILD_DIR/caddy.pkgs "$pkgs")  
   # echo pkgs after build 
   # echo $pkgs
   [[ -f $CADDY_CONF/caddy.pkgs ]] && pkgs=$(clean $CADDY_CONF/caddy.pkgs "$pkgs")

src/packages/packages.lst

@@ -0,0 +1,8 @@
+ca-certificates 
+libcap 
+mailcap 
+jq 
+ 
+
+
+

src/packages/packages.sh

@@ -1,8 +0,0 @@
-#!/bin/sh
-echo install packages for alpine caddy
-apk update; apk upgrade; 
-# note: shadow, bash, bash-completion coreutils are installed by default for alpine
-apk add --no-cache --no-progress ca-certificates libcap mailcap git jq bash curl 
-
-
-

test/build

@@ -1 +1,10 @@
-../build -e test.env $@ 
+#!/bin/bash
+[[ $1 = "-f" ]] && force=force && shift
+if [[ ! $(udbuild image exists -e test.env) || $force ]] ; then
+    echo $force building image
+    ../build -e test.env -a build.env $@ 
+    echo done building image
+  else 
+    echo using existing image, use -f to force rebuild
+fi
+

test/build.env

@@ -0,0 +1 @@
+UCI_SHELL=true

test/caddy

@@ -1 +1,3 @@
+source ./build $1
+[[ $force ]] && shift 1
 udbuild try -e test.env -m /opt/caddy/conf -h conf caddy $@

test/compose/docker-compose.yaml

@@ -10,7 +10,7 @@ services:
       - $CREDENTIALS
     volumes:
       - conf:/opt/caddy/conf
-      - opt:/opt
+      # - opt:/opt
     ports:
       - 80:80
       - 443:443
@@ -22,8 +22,8 @@ volumes:
       type: none
       device: ${PWD}/conf
       o: bind
-  opt:
+  # opt:
-    driver_opts:
+  #   driver_opts:
-      type: none
+  #     type: none
-      device: ${PWD}/opt
+  #     device: ${PWD}/opt
-      o: bind
+  #     o: bind

test/compose/log

@@ -0,0 +1,3 @@
+[[ $1 ]] && opt="-n $1"
+[[ $1 == "f" ]] && opt="-f"
+docker-compose logs $opt

test/compose/scrub

@@ -0,0 +1 @@
+docker-compose down -v

test/compose/start

@@ -0,0 +1,5 @@
+# if no image run ./build first
+source ./build $1
+[[ $force ]] && shift 1
+mkdir -p opt conf
+docker-compose ${@:-up}

test/compose/stop

@@ -0,0 +1 @@
+docker-compose down

test/compose/term

@@ -0,0 +1,3 @@
+#!/bin/bash
+source .env
+docker exec -it caddy-testing bash -l

test/get-packages

@@ -1 +1,3 @@
+# if no image run ./build first
+source ./build $1
 udbuild try -e test.env -m /opt/caddy/conf -h conf -s list-packages

test/shell

@@ -1 +0,0 @@
-udbuild try -e test.env -m /opt/caddy/conf -h conf shell $@

test/test

@@ -1,7 +0,0 @@
-# if no image run ./build first
-if docker image inspect testing/caddy >/dev/null 2>&1 ;then
-docker-compose ${@:-up}
-else 
-./build -e test -t default -p
-docker-compose ${@:-up}
-fi

test/try

@@ -0,0 +1,4 @@
+# if no image run ./build first
+source ./build $1
+[[ $force ]] && shift 1
+udbuild try -e test.env -m /opt/caddy/conf -h conf ${@:-shell}