From 1ba2014e4d875d7d6477b60728ae9702bf6bfa10 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Tue, 19 Nov 2019 14:10:17 +0100 Subject: [PATCH] Rename to rootfs --- .editorconfig | 2 +- .gitattributes | 2 +- Dockerfile | 2 +- {assets => rootfs}/etc/cont-init.d/00-fix-logs.sh | 0 {assets => rootfs}/etc/cont-init.d/01-fix-uidgid.sh | 0 {assets => rootfs}/etc/cont-init.d/02-fix-perms.sh | 0 {assets => rootfs}/etc/cont-init.d/03-config.sh | 0 {assets => rootfs}/etc/cont-init.d/04-svc-main.sh | 0 {assets => rootfs}/etc/cont-init.d/05-svc-cron.sh | 0 {assets => rootfs}/etc/cont-init.d/06-svc-syslogng.sh | 0 {assets => rootfs}/etc/syslog-ng/syslog-ng.conf | 0 {assets => rootfs}/tpls/etc/nginx/nginx.conf | 0 {assets => rootfs}/tpls/etc/php7/conf.d/opcache.ini | 0 {assets => rootfs}/tpls/etc/php7/php-fpm.d/www.conf | 0 14 files changed, 3 insertions(+), 3 deletions(-) rename {assets => rootfs}/etc/cont-init.d/00-fix-logs.sh (100%) rename {assets => rootfs}/etc/cont-init.d/01-fix-uidgid.sh (100%) rename {assets => rootfs}/etc/cont-init.d/02-fix-perms.sh (100%) rename {assets => rootfs}/etc/cont-init.d/03-config.sh (100%) rename {assets => rootfs}/etc/cont-init.d/04-svc-main.sh (100%) rename {assets => rootfs}/etc/cont-init.d/05-svc-cron.sh (100%) rename {assets => rootfs}/etc/cont-init.d/06-svc-syslogng.sh (100%) rename {assets => rootfs}/etc/syslog-ng/syslog-ng.conf (100%) rename {assets => rootfs}/tpls/etc/nginx/nginx.conf (100%) rename {assets => rootfs}/tpls/etc/php7/conf.d/opcache.ini (100%) rename {assets => rootfs}/tpls/etc/php7/php-fpm.d/www.conf (100%) diff --git a/.editorconfig b/.editorconfig index b7801b2..10ec7fc 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,7 +9,7 @@ charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true -[assets/**] +[rootfs/**] insert_final_newline = false [*.md] diff --git a/.gitattributes b/.gitattributes index 3399cb4..eb8909a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ /*.sh linguist-detectable=false -/assets/** linguist-detectable=false +/rootfs/** linguist-detectable=false diff --git a/Dockerfile b/Dockerfile index 0338d4f..9f6d99a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -109,7 +109,7 @@ RUN mkdir -p /opt \ && chown -R nobody.nogroup ${LIBRENMS_PATH} \ && rm -rf /tmp/* -COPY assets / +COPY rootfs / RUN addgroup -g ${PGID} librenms \ && adduser -D -h ${LIBRENMS_PATH} -u ${PUID} -G librenms -s /bin/sh -D librenms \ diff --git a/assets/etc/cont-init.d/00-fix-logs.sh b/rootfs/etc/cont-init.d/00-fix-logs.sh similarity index 100% rename from assets/etc/cont-init.d/00-fix-logs.sh rename to rootfs/etc/cont-init.d/00-fix-logs.sh diff --git a/assets/etc/cont-init.d/01-fix-uidgid.sh b/rootfs/etc/cont-init.d/01-fix-uidgid.sh similarity index 100% rename from assets/etc/cont-init.d/01-fix-uidgid.sh rename to rootfs/etc/cont-init.d/01-fix-uidgid.sh diff --git a/assets/etc/cont-init.d/02-fix-perms.sh b/rootfs/etc/cont-init.d/02-fix-perms.sh similarity index 100% rename from assets/etc/cont-init.d/02-fix-perms.sh rename to rootfs/etc/cont-init.d/02-fix-perms.sh diff --git a/assets/etc/cont-init.d/03-config.sh b/rootfs/etc/cont-init.d/03-config.sh similarity index 100% rename from assets/etc/cont-init.d/03-config.sh rename to rootfs/etc/cont-init.d/03-config.sh diff --git a/assets/etc/cont-init.d/04-svc-main.sh b/rootfs/etc/cont-init.d/04-svc-main.sh similarity index 100% rename from assets/etc/cont-init.d/04-svc-main.sh rename to rootfs/etc/cont-init.d/04-svc-main.sh diff --git a/assets/etc/cont-init.d/05-svc-cron.sh b/rootfs/etc/cont-init.d/05-svc-cron.sh similarity index 100% rename from assets/etc/cont-init.d/05-svc-cron.sh rename to rootfs/etc/cont-init.d/05-svc-cron.sh diff --git a/assets/etc/cont-init.d/06-svc-syslogng.sh b/rootfs/etc/cont-init.d/06-svc-syslogng.sh similarity index 100% rename from assets/etc/cont-init.d/06-svc-syslogng.sh rename to rootfs/etc/cont-init.d/06-svc-syslogng.sh diff --git a/assets/etc/syslog-ng/syslog-ng.conf b/rootfs/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from assets/etc/syslog-ng/syslog-ng.conf rename to rootfs/etc/syslog-ng/syslog-ng.conf diff --git a/assets/tpls/etc/nginx/nginx.conf b/rootfs/tpls/etc/nginx/nginx.conf similarity index 100% rename from assets/tpls/etc/nginx/nginx.conf rename to rootfs/tpls/etc/nginx/nginx.conf diff --git a/assets/tpls/etc/php7/conf.d/opcache.ini b/rootfs/tpls/etc/php7/conf.d/opcache.ini similarity index 100% rename from assets/tpls/etc/php7/conf.d/opcache.ini rename to rootfs/tpls/etc/php7/conf.d/opcache.ini diff --git a/assets/tpls/etc/php7/php-fpm.d/www.conf b/rootfs/tpls/etc/php7/php-fpm.d/www.conf similarity index 100% rename from assets/tpls/etc/php7/php-fpm.d/www.conf rename to rootfs/tpls/etc/php7/php-fpm.d/www.conf