diff --git a/Dockerfile b/Dockerfile index b638ab6..bad448e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,17 +18,20 @@ RUN apk add rsync nginx zlib-dev libpng-dev freetype-dev libjpeg-turbo-dev \ && chown www-data:www-data www/navs/ \ && chown www-data:www-data www/girls/ \ && chown www-data:www-data www/videos/ \ - && cd /var/www/downloads/ \ - && wget "https://git.filesite.io/wen/jialuomaadmin/archive/master.tar.gz" \ - && tar -zxvf master.tar.gz \ - && rm -f master.tar.gz \ - && rm -rf /var/www/machete/www/admin/ \ - && mv jialuomaadmin/dist/ /var/www/machete/www/admin \ && rm -f /etc/nginx/http.d/default.conf \ && cp /var/www/machete/conf/nginx_machete.conf /etc/nginx/http.d/machete.conf \ && ln -s /var/www/machete/bin/upgrade.sh /usr/bin/upgrade_machete EXPOSE 80/tcp ENTRYPOINT ["/var/www/machete/docker-entrypoint.sh"] -# 默认使用导航站皮肤:manual -CMD ["manual"] \ No newline at end of file +# 默认使用图片展皮肤:beauty +CMD ["beauty"] + + +# 去掉admin后台 +#&& cd /var/www/downloads/ \ +#&& wget "https://git.filesite.io/wen/jialuomaadmin/archive/master.tar.gz" \ +# && tar -zxvf master.tar.gz \ +# && rm -f master.tar.gz \ +# && rm -rf /var/www/machete/www/admin/ \ +# && mv jialuomaadmin/dist/ /var/www/machete/www/admin \ \ No newline at end of file diff --git a/Dockerfile_samba b/Dockerfile_samba index 5af74dc..135ab43 100644 --- a/Dockerfile_samba +++ b/Dockerfile_samba @@ -21,12 +21,6 @@ RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.n && chown apache:apache www/navs/ \ && chown apache:apache www/girls/ \ && chown apache:apache www/videos/ \ - && cd /var/www/downloads/ \ - && wget "https://git.filesite.io/wen/jialuomaadmin/archive/master.tar.gz" \ - && tar -zxvf master.tar.gz \ - && rm -f master.tar.gz \ - && rm -rf /var/www/machete/www/admin/ \ - && mv jialuomaadmin/dist/ /var/www/machete/www/admin \ && rm -f /etc/nginx/nginx.conf \ && cp /var/www/machete/conf/nginx.conf /etc/nginx/nginx.conf \ && cp /var/www/machete/conf/nginx_machete.conf /etc/nginx/conf.d/machete.conf \ @@ -58,5 +52,5 @@ EXPOSE 9000/tcp EXPOSE 80/tcp EXPOSE 445/tcp ENTRYPOINT ["/var/www/machete/docker-entrypoint.sh"] -# 默认使用导航站皮肤:manual -CMD ["manual"] \ No newline at end of file +# 默认使用图片展皮肤:beauty +CMD ["beauty"] \ No newline at end of file