[TASK] Cleanup files and use shipped binaries

Fixes: #5

build.sh

@@ -48,7 +48,7 @@ loadVersionAndTags() {
   fi
 }
 
-while getopts ":v:h:p" opt; do
+while getopts ":v:hpl" opt; do
   case $opt in
   h)
     help
@@ -60,6 +60,9 @@ while getopts ":v:h:p" opt; do
   p)
     PUSH="--push"
     ;;
+  l)
+    LOAD="--load"
+    ;;
   *)
     echo "Invalid option: -$OPTARG"
     help
@@ -71,5 +74,5 @@ done
 loadVersionAndTags
 
 # @todo: Add --load option
-docker buildx build --platform linux/amd64,linux/arm64 --no-cache --pull . -f Dockerfile ${DOCKER_TAGS[@]} --build-arg ddev_version="$DDEV_VERSION" $PUSH
+docker buildx build --platform linux/amd64,linux/arm64 --no-cache --pull . -f Dockerfile ${DOCKER_TAGS[@]} --build-arg ddev_version="$DDEV_VERSION" $PUSH $LOAD
 #docker run --rm -it -v "$(pwd)/test.sh:/tmp/test.sh" --entrypoint "ash" "$IMAGE_NAME:$DDEV_VERSION" /tmp/test.sh

ddev-install.sh

@@ -1,9 +1,11 @@
 #!/usr/bin/ash
 
-apk add bash sudo
+apk add --no-cache bash sudo bash-completion
 adduser -D ddev -g "ddev" -s /bin/bash -D ddev -h /home/ddev
 echo "ddev ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/ddev && chmod 0440 /etc/sudoers.d/ddev
 unamearch=$(uname -m)
+
+# Get binary to be downloaded
 case ${unamearch} in
   x86_64) ARCH="amd64";
 ;;
@@ -15,17 +17,15 @@ case ${unamearch} in
 ;;
 esac
 
-echo "https://github.com/ddev/ddev/releases/download/${DDEV_VERSION}/ddev_linux-${ARCH}.${DDEV_VERSION}.tar.gz"
-
 wget "https://github.com/ddev/ddev/releases/download/${DDEV_VERSION}/ddev_linux-${ARCH}.${DDEV_VERSION}.tar.gz"
-tar xfvz "ddev_linux-${ARCH}.${DDEV_VERSION}.tar.gz"
-mv ddev /usr/local/bin/
+
+# Prepare and install binaries
+mkdir ddev
+tar xfvz "ddev_linux-${ARCH}.${DDEV_VERSION}.tar.gz" --directory ddev
+mv ddev/ddev /usr/local/bin/
+mv ddev/mkcert /usr/local/bin/
+rm -Rf ddev "ddev_linux-${ARCH}.${DDEV_VERSION}.tar.gz"
 
 # Ensure required folders exist
 mkdir -p /home/ddev/.ddev/commands/host
 chown -R ddev:ddev /home/ddev/.ddev/
-
-# Install mkcert
-wget "https://github.com/FiloSottile/mkcert/releases/download/v1.4.4/mkcert-v1.4.4-linux-${ARCH}"
-mv "mkcert-v1.4.4-linux-${ARCH}" /usr/local/bin/mkcert
-chmod +x /usr/local/bin/mkcert