From 092becfec7c9dcf986bbca8d2579174a6d2c7bd6 Mon Sep 17 00:00:00 2001 From: Mr Bot Date: Thu, 26 Sep 2019 17:46:59 +0300 Subject: [PATCH] fixes --- nextcloud/{latest => }/.docker-repository.yml | 0 nextcloud/{latest => }/.dockerignore | 0 nextcloud/{latest => }/Dockerfile | 6 +++--- nextcloud/{latest => }/Makefile | 0 nextcloud/{latest => }/Streamer.php | 0 nextcloud/{latest => }/php-smbclient-latest.tar.gz | Bin nextcloud/{latest => }/smb.conf | 0 7 files changed, 3 insertions(+), 3 deletions(-) rename nextcloud/{latest => }/.docker-repository.yml (100%) rename nextcloud/{latest => }/.dockerignore (100%) rename nextcloud/{latest => }/Dockerfile (92%) rename nextcloud/{latest => }/Makefile (100%) rename nextcloud/{latest => }/Streamer.php (100%) rename nextcloud/{latest => }/php-smbclient-latest.tar.gz (100%) rename nextcloud/{latest => }/smb.conf (100%) diff --git a/nextcloud/latest/.docker-repository.yml b/nextcloud/.docker-repository.yml similarity index 100% rename from nextcloud/latest/.docker-repository.yml rename to nextcloud/.docker-repository.yml diff --git a/nextcloud/latest/.dockerignore b/nextcloud/.dockerignore similarity index 100% rename from nextcloud/latest/.dockerignore rename to nextcloud/.dockerignore diff --git a/nextcloud/latest/Dockerfile b/nextcloud/Dockerfile similarity index 92% rename from nextcloud/latest/Dockerfile rename to nextcloud/Dockerfile index 99f430cb0..dc0e55f7f 100644 --- a/nextcloud/latest/Dockerfile +++ b/nextcloud/Dockerfile @@ -1,8 +1,8 @@ FROM nextcloud:latest ENV DEBIAN_FRONTEND noninteractive - + #smb additional magic -ADD php-smbclient-latest.tar.gz /tmp +ADD php-smbclient-latest.tar.gz /tmp RUN cp -fv /tmp/php-smbclient-latest/etc/php/7.3/mods-available/smbclient.ini /usr/local/etc/php/conf.d/smbclient.ini && \ cp -fv /tmp/php-smbclient-latest/usr/lib/php/20180731/smbclient.so /usr/local/lib/php/extensions/no-debug-non-zts-20180731/smbclient.so && \ rm -frv /tmp/php-smbclient-latest.tar.gz /tmp/php-smbclient-latest @@ -16,5 +16,5 @@ ADD Streamer.php /var/www/html/lib/private/ #smb fix RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf -ADD smb.conf /etc/samba/ +ADD smb.conf /etc/samba/ ADD smb.conf /usr/share/samba/ diff --git a/nextcloud/latest/Makefile b/nextcloud/Makefile similarity index 100% rename from nextcloud/latest/Makefile rename to nextcloud/Makefile diff --git a/nextcloud/latest/Streamer.php b/nextcloud/Streamer.php similarity index 100% rename from nextcloud/latest/Streamer.php rename to nextcloud/Streamer.php diff --git a/nextcloud/latest/php-smbclient-latest.tar.gz b/nextcloud/php-smbclient-latest.tar.gz similarity index 100% rename from nextcloud/latest/php-smbclient-latest.tar.gz rename to nextcloud/php-smbclient-latest.tar.gz diff --git a/nextcloud/latest/smb.conf b/nextcloud/smb.conf similarity index 100% rename from nextcloud/latest/smb.conf rename to nextcloud/smb.conf