diff --git a/Dockerfile b/Dockerfile index 8ca670a..e120f7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -59,7 +59,7 @@ ENV USER="${USER}" USER ${USER} WORKDIR /root -COPY ./dockerfs/. / +COPY ./rootfs/. / RUN set -e; \ echo 'Installing packages' && \ diff --git a/Dockerfile.3.14 b/Dockerfile.3.14 index d6b7cda..5a97762 100644 --- a/Dockerfile.3.14 +++ b/Dockerfile.3.14 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.14 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.15 b/Dockerfile.3.15 index d2d8388..6135c41 100644 --- a/Dockerfile.3.15 +++ b/Dockerfile.3.15 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.15 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.16 b/Dockerfile.3.16 index af95715..651e8fe 100644 --- a/Dockerfile.3.16 +++ b/Dockerfile.3.16 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.16 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.17 b/Dockerfile.3.17 index e695ffc..35bcc80 100644 --- a/Dockerfile.3.17 +++ b/Dockerfile.3.17 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.17 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.18 b/Dockerfile.3.18 index c0ad480..fad7553 100644 --- a/Dockerfile.3.18 +++ b/Dockerfile.3.18 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.18 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.19 b/Dockerfile.3.19 index 131d58a..dde5857 100644 --- a/Dockerfile.3.19 +++ b/Dockerfile.3.19 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.19 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.20 b/Dockerfile.3.20 index 594e710..c0480f8 100644 --- a/Dockerfile.3.20 +++ b/Dockerfile.3.20 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.20 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.21 b/Dockerfile.3.21 index f66bd9e..053b1c6 100644 --- a/Dockerfile.3.21 +++ b/Dockerfile.3.21 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.21 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.22 b/Dockerfile.3.22 index 52d5ed9..0b5c903 100644 --- a/Dockerfile.3.22 +++ b/Dockerfile.3.22 @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.3.22 /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/Dockerfile.3.23 b/Dockerfile.3.23 index c1bc525..d610930 100644 --- a/Dockerfile.3.23 +++ b/Dockerfile.3.23 @@ -59,7 +59,7 @@ ENV USER="${USER}" USER ${USER} WORKDIR /root -COPY ./dockerfs/. / +COPY ./rootfs/. / RUN set -e; \ echo 'Installing packages' && \ diff --git a/Dockerfile.edge b/Dockerfile.edge index 85fee36..58ffc8e 100644 --- a/Dockerfile.edge +++ b/Dockerfile.edge @@ -66,7 +66,7 @@ ENV HOSTNAME="casjaysdev-alpine" USER ${USER} WORKDIR /root -COPY ./dockerfs/usr/local/bin/. /usr/local/bin/ +COPY ./rootfs/usr/local/bin/. /usr/local/bin/ RUN set -e; \ echo "Setting up prerequisites"; \ @@ -113,7 +113,7 @@ RUN echo "Initializing packages before copying files to image"; \ if [ -f "/root/docker/setup/02-packages.sh" ];then echo "Running the packages script";/root/docker/setup/02-packages.sh||{ echo "Failed to execute /root/docker/setup/02-packages.sh" >&2 && exit 10; };echo "Done running the packages script";fi; \ echo "" -COPY ./dockerfs/. / +COPY ./rootfs/. / COPY ./Dockerfile.edge /root/docker/Dockerfile RUN echo "Updating system files "; \ diff --git a/README.md b/README.md index c74c6be..14118e2 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ dockermgr update os alpine ```shell mkdir -p "/var/lib/srv/root/docker/casjaysdev/alpine/latest" git clone "https://github.com/dockermgr/alpine" "$HOME/.local/share/CasjaysDev/dockermgr/alpine" -cp -Rfva "$HOME/.local/share/CasjaysDev/dockermgr/alpine/dockerfs/." "/var/lib/srv/root/docker/casjaysdev/alpine/latest/" +cp -Rfva "$HOME/.local/share/CasjaysDev/dockermgr/alpine/rootfs/." "/var/lib/srv/root/docker/casjaysdev/alpine/latest/" docker run -d \ --restart always \ --privileged \ diff --git a/dockerfs/root/docker/setup/00-init.sh b/rootfs/root/docker/setup/00-init.sh similarity index 100% rename from dockerfs/root/docker/setup/00-init.sh rename to rootfs/root/docker/setup/00-init.sh diff --git a/dockerfs/root/docker/setup/01-system.sh b/rootfs/root/docker/setup/01-system.sh similarity index 100% rename from dockerfs/root/docker/setup/01-system.sh rename to rootfs/root/docker/setup/01-system.sh diff --git a/dockerfs/root/docker/setup/02-packages.sh b/rootfs/root/docker/setup/02-packages.sh similarity index 100% rename from dockerfs/root/docker/setup/02-packages.sh rename to rootfs/root/docker/setup/02-packages.sh diff --git a/dockerfs/root/docker/setup/03-files.sh b/rootfs/root/docker/setup/03-files.sh similarity index 100% rename from dockerfs/root/docker/setup/03-files.sh rename to rootfs/root/docker/setup/03-files.sh diff --git a/dockerfs/root/docker/setup/04-users.sh b/rootfs/root/docker/setup/04-users.sh similarity index 100% rename from dockerfs/root/docker/setup/04-users.sh rename to rootfs/root/docker/setup/04-users.sh diff --git a/dockerfs/root/docker/setup/05-custom.sh b/rootfs/root/docker/setup/05-custom.sh similarity index 100% rename from dockerfs/root/docker/setup/05-custom.sh rename to rootfs/root/docker/setup/05-custom.sh diff --git a/dockerfs/root/docker/setup/06-post.sh b/rootfs/root/docker/setup/06-post.sh similarity index 100% rename from dockerfs/root/docker/setup/06-post.sh rename to rootfs/root/docker/setup/06-post.sh diff --git a/dockerfs/root/docker/setup/07-cleanup.sh b/rootfs/root/docker/setup/07-cleanup.sh similarity index 100% rename from dockerfs/root/docker/setup/07-cleanup.sh rename to rootfs/root/docker/setup/07-cleanup.sh diff --git a/dockerfs/usr/local/bin/copy b/rootfs/usr/local/bin/copy similarity index 100% rename from dockerfs/usr/local/bin/copy rename to rootfs/usr/local/bin/copy diff --git a/dockerfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh similarity index 100% rename from dockerfs/usr/local/bin/entrypoint.sh rename to rootfs/usr/local/bin/entrypoint.sh diff --git a/dockerfs/usr/local/bin/pkmgr b/rootfs/usr/local/bin/pkmgr similarity index 100% rename from dockerfs/usr/local/bin/pkmgr rename to rootfs/usr/local/bin/pkmgr diff --git a/dockerfs/usr/local/bin/symlink b/rootfs/usr/local/bin/symlink similarity index 100% rename from dockerfs/usr/local/bin/symlink rename to rootfs/usr/local/bin/symlink diff --git a/dockerfs/usr/local/etc/docker/functions/entrypoint.sh b/rootfs/usr/local/etc/docker/functions/entrypoint.sh similarity index 100% rename from dockerfs/usr/local/etc/docker/functions/entrypoint.sh rename to rootfs/usr/local/etc/docker/functions/entrypoint.sh diff --git a/dockerfs/usr/local/share/template-files/config/.gitkeep b/rootfs/usr/local/share/template-files/config/.gitkeep similarity index 100% rename from dockerfs/usr/local/share/template-files/config/.gitkeep rename to rootfs/usr/local/share/template-files/config/.gitkeep diff --git a/dockerfs/usr/local/share/template-files/config/env/default.sample b/rootfs/usr/local/share/template-files/config/env/default.sample similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/default.sample rename to rootfs/usr/local/share/template-files/config/env/default.sample diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/00-directory.sh b/rootfs/usr/local/share/template-files/config/env/examples/00-directory.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/00-directory.sh rename to rootfs/usr/local/share/template-files/config/env/examples/00-directory.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/addresses.sh b/rootfs/usr/local/share/template-files/config/env/examples/addresses.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/addresses.sh rename to rootfs/usr/local/share/template-files/config/env/examples/addresses.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/certbot.sh b/rootfs/usr/local/share/template-files/config/env/examples/certbot.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/certbot.sh rename to rootfs/usr/local/share/template-files/config/env/examples/certbot.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/couchdb.sh b/rootfs/usr/local/share/template-files/config/env/examples/couchdb.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/couchdb.sh rename to rootfs/usr/local/share/template-files/config/env/examples/couchdb.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/dockerd.sh b/rootfs/usr/local/share/template-files/config/env/examples/dockerd.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/dockerd.sh rename to rootfs/usr/local/share/template-files/config/env/examples/dockerd.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/global.sh b/rootfs/usr/local/share/template-files/config/env/examples/global.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/global.sh rename to rootfs/usr/local/share/template-files/config/env/examples/global.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/healthcheck.sh b/rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/healthcheck.sh rename to rootfs/usr/local/share/template-files/config/env/examples/healthcheck.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/mariadb.sh b/rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/mariadb.sh rename to rootfs/usr/local/share/template-files/config/env/examples/mariadb.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/mongodb.sh b/rootfs/usr/local/share/template-files/config/env/examples/mongodb.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/mongodb.sh rename to rootfs/usr/local/share/template-files/config/env/examples/mongodb.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/networking.sh b/rootfs/usr/local/share/template-files/config/env/examples/networking.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/networking.sh rename to rootfs/usr/local/share/template-files/config/env/examples/networking.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/other.sh b/rootfs/usr/local/share/template-files/config/env/examples/other.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/other.sh rename to rootfs/usr/local/share/template-files/config/env/examples/other.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/php.sh b/rootfs/usr/local/share/template-files/config/env/examples/php.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/php.sh rename to rootfs/usr/local/share/template-files/config/env/examples/php.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/postgres.sh b/rootfs/usr/local/share/template-files/config/env/examples/postgres.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/postgres.sh rename to rootfs/usr/local/share/template-files/config/env/examples/postgres.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/redis.sh b/rootfs/usr/local/share/template-files/config/env/examples/redis.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/redis.sh rename to rootfs/usr/local/share/template-files/config/env/examples/redis.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/services.sh b/rootfs/usr/local/share/template-files/config/env/examples/services.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/services.sh rename to rootfs/usr/local/share/template-files/config/env/examples/services.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/ssl.sh b/rootfs/usr/local/share/template-files/config/env/examples/ssl.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/ssl.sh rename to rootfs/usr/local/share/template-files/config/env/examples/ssl.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/supabase.sh b/rootfs/usr/local/share/template-files/config/env/examples/supabase.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/supabase.sh rename to rootfs/usr/local/share/template-files/config/env/examples/supabase.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/webservers.sh b/rootfs/usr/local/share/template-files/config/env/examples/webservers.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/webservers.sh rename to rootfs/usr/local/share/template-files/config/env/examples/webservers.sh diff --git a/dockerfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh b/rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh similarity index 100% rename from dockerfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh rename to rootfs/usr/local/share/template-files/config/env/examples/zz-entrypoint.sh diff --git a/dockerfs/usr/local/share/template-files/data/.gitkeep b/rootfs/usr/local/share/template-files/data/.gitkeep similarity index 100% rename from dockerfs/usr/local/share/template-files/data/.gitkeep rename to rootfs/usr/local/share/template-files/data/.gitkeep diff --git a/dockerfs/usr/local/share/template-files/defaults/.gitkeep b/rootfs/usr/local/share/template-files/defaults/.gitkeep similarity index 100% rename from dockerfs/usr/local/share/template-files/defaults/.gitkeep rename to rootfs/usr/local/share/template-files/defaults/.gitkeep