From 05ddb754ccb643a31d0f4065c2708d1e2c9711fa Mon Sep 17 00:00:00 2001
From: zontreck <tarapiccari@gmail.com>
Date: Mon, 17 Mar 2025 23:12:01 -0700
Subject: [PATCH] Commit latest image changes

---
 DIND/Agent/entrypoint.sh | 12 ++++++++++--
 DIND/Dockerfile          |  2 +-
 DIND/Wings/Dockerfile    |  7 ++++++-
 DIND/Wings/entrypoint.sh | 13 +++++++++++--
 build.sh                 | 16 ++++++++--------
 publish.sh               | 21 +++++++++++++++++++++
 6 files changed, 57 insertions(+), 14 deletions(-)
 create mode 100755 publish.sh

diff --git a/DIND/Agent/entrypoint.sh b/DIND/Agent/entrypoint.sh
index 6d54855..4c5dea3 100644
--- a/DIND/Agent/entrypoint.sh
+++ b/DIND/Agent/entrypoint.sh
@@ -1,6 +1,14 @@
-#!/bin/bash
+#!/bin/sh
+dind
 
-/usr/local/sbin/dockerd-entrypoint.sh
+# Start Docker daemon in the background
+dockerd &
+
+# Wait for Docker daemon to be ready
+while (! docker info > /dev/null 2>&1); do
+  echo "Waiting for Docker daemon to start..."
+  sleep 1
+done
 
 if [ -d /keys ]
 then
diff --git a/DIND/Dockerfile b/DIND/Dockerfile
index 89109b9..b4ed085 100644
--- a/DIND/Dockerfile
+++ b/DIND/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:28-dind-rootless
+FROM docker:28-dind
 
 ENV HOME /root
 USER root
diff --git a/DIND/Wings/Dockerfile b/DIND/Wings/Dockerfile
index 4ee8fd8..1eaf488 100644
--- a/DIND/Wings/Dockerfile
+++ b/DIND/Wings/Dockerfile
@@ -4,8 +4,13 @@ RUN curl -L -o /usr/local/bin/wings "https://github.com/pelican-dev/wings/releas
 RUN mkdir -pv /etc/pelican /var/run/wings
 RUN chmod u+x /usr/local/bin/wings
 
+ENV TZ=America/Phoenix
+
+RUN apk add --no-cache tzdata
+RUN ln -sfv /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
 
 ADD ./entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-CMD ["/entrypoint.sh"]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/DIND/Wings/entrypoint.sh b/DIND/Wings/entrypoint.sh
index 002e5da..a908578 100644
--- a/DIND/Wings/entrypoint.sh
+++ b/DIND/Wings/entrypoint.sh
@@ -1,4 +1,13 @@
-#!/bin/bash
-/usr/local/sbin/dockerd-entrypoint.sh
+#!/bin/sh
+dind
+
+# Start Docker daemon in the background
+dockerd &
+
+# Wait for Docker daemon to be ready
+while (! docker info > /dev/null 2>&1); do
+  echo "Waiting for Docker daemon to start..."
+  sleep 1
+done
 
 /usr/local/bin/wings
\ No newline at end of file
diff --git a/build.sh b/build.sh
index 60097e5..e9329ef 100755
--- a/build.sh
+++ b/build.sh
@@ -15,19 +15,19 @@ docker push git.zontreck.com/packages/flutter:latest
 docker build -t git.zontreck.com/packages/appimage:latest AppImage
 docker push git.zontreck.com/packages/appimage:latest
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:linuxfs FirestormLinux
-docker push git.zontreck.com/ariascreations/buildenvironments:linuxfs
+docker build -t git.zontreck.com/packages/buildenvironments:linuxfs FirestormLinux
+docker push git.zontreck.com/packages/buildenvironments:linuxfs
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:linux LinuxGeneralCompiler
-docker push git.zontreck.com/ariascreations/buildenvironments:linux
+docker build -t git.zontreck.com/packages/buildenvironments:linux LinuxGeneralCompiler
+docker push git.zontreck.com/packages/buildenvironments:linux
 
 
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:arch ArchBase
-docker push git.zontreck.com/ariascreations/buildenvironments:arch
+docker build -t git.zontreck.com/packages/buildenvironments:arch ArchBase
+docker push git.zontreck.com/packages/buildenvironments:arch
 
-docker build -t git.zontreck.com/ariascreations/buildenvironments:archdev ArchBuilder
-docker push git.zontreck.com/ariascreations/buildenvironments:archdev
+docker build -t git.zontreck.com/packages/buildenvironments:archdev ArchBuilder
+docker push git.zontreck.com/packages/buildenvironments:archdev
 
 
 docker build -t git.zontreck.com/packages/dind:latest DIND
diff --git a/publish.sh b/publish.sh
new file mode 100755
index 0000000..a63f529
--- /dev/null
+++ b/publish.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+docker push git.zontreck.com/packages/debian:base
+docker push git.zontreck.com/packages/debian:build
+docker push git.zontreck.com/packages/adk:latest
+docker push git.zontreck.com/packages/flutter:latest
+docker push git.zontreck.com/packages/appimage:latest
+docker push git.zontreck.com/packages/buildenvironments:linuxfs
+docker push git.zontreck.com/packages/buildenvironments:linux
+
+docker push git.zontreck.com/packages/arch:base
+docker push git.zontreck.com/packages/arch:build
+
+
+docker push git.zontreck.com/packages/dind:latest
+docker push git.zontreck.com/packages/buildenvironments:dind
+docker push git.zontreck.com/packages/dind:wings
+
+docker push git.zontreck.com/packages/nextcloud:latest
+
+docker push git.zontreck.com/packages/jenkins:latest
\ No newline at end of file