From 44fa3db81991560451259b11f501f797f3b57a52 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 18 May 2020 02:19:03 -0500 Subject: [PATCH] also changed path in containerfiles --- src/debian/Containerfile | 4 ++-- src/gitea/Containerfile | 10 +++++----- src/nextcloud/Containerfile | 16 ++++++++-------- src/samba/Containerfile | 4 ++-- src/startpage/Containerfile | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/debian/Containerfile b/src/debian/Containerfile index 777a5fa..2326dc3 100644 --- a/src/debian/Containerfile +++ b/src/debian/Containerfile @@ -19,5 +19,5 @@ RUN apt autoremove -y --purge RUN apt clean -y # Set configuration -COPY resources/nanorc /etc/nanorc -COPY resources/bash.bashrc /etc/bash.bashrc +COPY assets/nanorc /etc/nanorc +COPY assets/bash.bashrc /etc/bash.bashrc diff --git a/src/gitea/Containerfile b/src/gitea/Containerfile index b52e28b..6805018 100644 --- a/src/gitea/Containerfile +++ b/src/gitea/Containerfile @@ -38,14 +38,14 @@ RUN addgroup --gid $FILESUID gitea && \ adduser gitea --ingroup gitea --uid $FILESUID --disabled-password --gecos "Gitea Server" --shell /usr/sbin/nologin # copy our custom scripts -COPY resources/bin/ /usr/local/bin/ +COPY assets/bin/ /usr/local/bin/ ### ### PostgreSQL ### ### # configure PostgreSQL access -COPY --chown=postgres:postgres resources/pg_hba.conf /etc/postgresql/${psqlv}/main/pg_hba.conf +COPY --chown=postgres:postgres assets/pg_hba.conf /etc/postgresql/${psqlv}/main/pg_hba.conf ### ### Gitea @@ -64,19 +64,19 @@ RUN mkdir -p /var/lib/gitea/ && \ chmod -R 750 /var/lib/gitea/ # copy gitea config template -COPY resources/app.ini.esh /etc/gitea/ +COPY assets/app.ini.esh /etc/gitea/ # template config file RUN cd /etc/gitea/ && \ esh app.ini.esh > app.ini && \ rm app.ini.esh && \ chmod -R +r /etc/gitea/ -COPY resources/gitea.service /etc/systemd/system/ +COPY assets/gitea.service /etc/systemd/system/ ### ### Crontab ### -COPY resources/crontab /root/ +COPY assets/crontab /root/ RUN crontab -u gitea /root/crontab ### diff --git a/src/nextcloud/Containerfile b/src/nextcloud/Containerfile index 04148bd..f65e575 100644 --- a/src/nextcloud/Containerfile +++ b/src/nextcloud/Containerfile @@ -42,7 +42,7 @@ RUN usermod --uid $FILESUID www-data && \ chown -R www-data:www-data /var/www /vol # copy our custom scripts -COPY resources/bin/ /usr/local/bin/ +COPY assets/bin/ /usr/local/bin/ ### ### Apache @@ -52,7 +52,7 @@ COPY resources/bin/ /usr/local/bin/ RUN a2enmod rewrite headers env dir mime proxy_fcgi && a2enconf php${phpv}-fpm # copy site config -COPY resources/apache/nextcloud.conf /etc/apache2/sites-available/ +COPY assets/apache/nextcloud.conf /etc/apache2/sites-available/ WORKDIR /etc/apache2/sites-enabled RUN rm 000-default.conf && ln -s ../sites-available/nextcloud.conf @@ -64,15 +64,15 @@ RUN rm 000-default.conf && ln -s ../sites-available/nextcloud.conf RUN systemctl enable php${phpv}-fpm # copy php configuration -COPY resources/php/php.ini /etc/php/${phpv}/fpm/ -COPY resources/php/www.conf /etc/php/${phpv}/fpm/pool.d/ +COPY assets/php/php.ini /etc/php/${phpv}/fpm/ +COPY assets/php/www.conf /etc/php/${phpv}/fpm/pool.d/ ### ### Redis ### # copy redis config -COPY --chown=redis:redis resources/redis.conf /etc/redis/redis.conf +COPY --chown=redis:redis assets/redis.conf /etc/redis/redis.conf # add www-data to redis group so it can use the socket RUN usermod -a -G redis www-data @@ -82,7 +82,7 @@ RUN usermod -a -G redis www-data ### # configure PostgreSQL access -COPY --chown=postgres:postgres resources/pg_hba.conf /etc/postgresql/${psqlv}/main/pg_hba.conf +COPY --chown=postgres:postgres assets/pg_hba.conf /etc/postgresql/${psqlv}/main/pg_hba.conf ### ### Nextcloud @@ -97,12 +97,12 @@ RUN wget https://download.nextcloud.com/server/releases/latest.zip && \ rm latest.zip # copy nextcloud config -COPY --chown=www-data:www-data resources/my.config.php nextcloud/config/ +COPY --chown=www-data:www-data assets/my.config.php nextcloud/config/ ### ### Crontab ### -COPY resources/crontab /root/ +COPY assets/crontab /root/ # crontab for www-data RUN crontab -u www-data /root/crontab diff --git a/src/samba/Containerfile b/src/samba/Containerfile index ebbb848..9785e70 100644 --- a/src/samba/Containerfile +++ b/src/samba/Containerfile @@ -30,7 +30,7 @@ RUN addgroup --gid $FILESUID files && \ RUN chown -R files:files /vol # copy our custom scripts -COPY resources/bin/ /usr/local/bin/ +COPY assets/bin/ /usr/local/bin/ RUN ls -A /home @@ -49,4 +49,4 @@ RUN systemctl disable nmbd ### # copy samba config -COPY resources/smb.conf /etc/samba/smb.conf +COPY assets/smb.conf /etc/samba/smb.conf diff --git a/src/startpage/Containerfile b/src/startpage/Containerfile index 734b704..74b9f48 100644 --- a/src/startpage/Containerfile +++ b/src/startpage/Containerfile @@ -26,7 +26,7 @@ RUN apt update -y && apt install -y apache2 libapache2-mod-php php-json RUN a2enmod php${phpv} # copy site config -COPY resources/site.conf /etc/apache2/sites-available/ +COPY assets/site.conf /etc/apache2/sites-available/ WORKDIR /etc/apache2/sites-enabled RUN rm 000-default.conf && ln -s ../sites-available/site.conf @@ -45,8 +45,8 @@ RUN wget https://github.com/saschadiercks/browserStartpage/archive/master.zip && # copy config WORKDIR /var/www/html/browserStartpage -COPY --chown=www-data:www-data resources/config.php config/config.php -COPY --chown=www-data:www-data resources/data.json data/data.json +COPY --chown=www-data:www-data assets/config.php config/config.php +COPY --chown=www-data:www-data assets/data.json data/data.json # copy assets -#COPY --chown=www-data:www-data resources/assets/ assets/ +#COPY --chown=www-data:www-data assets/assets/ assets/