diff --git a/Dockerfile b/Dockerfile index 451da3a..2c5b61a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ RUN \ # update && apt-get update && apt-get -y --no-install-recommends upgrade \ - && apt-get install -y --no-install-recommends libpcre3-dev libssl-dev dpkg-dev libgd-dev \ + && apt-get install -y --no-install-recommends libpcre3-dev libssl-dev dpkg-dev libgd-dev iproute \ # install nginx with pagespeed first so vesta config can override && mkdir -p ${NGINX_BUILD_DIR} \ @@ -121,7 +121,7 @@ RUN \ --vsftpd no --proftpd no \ --named yes --exim yes --dovecot yes \ --spamassassin yes --clamav yes \ - --iptables no --fail2ban no \ + --iptables yes --fail2ban yes \ --mysql yes --postgresql yes --remi yes \ --quota no --password MakeItSo18 \ -y no -f \ @@ -470,6 +470,13 @@ RUN \ /etc/redis/redis.conf \ && sed -i -e "s/\/etc\/redis/\/vesta\/etc\/redis/g" /etc/init.d/redis-server \ +# update nginx for vesta + && mv /usr/local/vesta/nginx/sbin /usr/local/vesta/nginx/sbin-bak \ + && mkdir -p /usr/local/vesta/nginx/sbin \ + && cp /usr/sbin/nginx /usr/local/vesta/nginx/sbin/nginx \ + && cp /usr/sbin/nginx /usr/local/vesta/nginx/sbin/nginx.old \ + && cp /usr/sbin/nginx /usr/local/vesta/nginx/sbin/nginx-vesta \ + # disable php*admin and roundcube by default, backup the config first - see README.md && mkdir -p /etc/apache2/conf-d \ && rsync -a /etc/apache2/conf.d/* /etc/apache2/conf-d \ diff --git a/README.md b/README.md index aa65995..b57be3f 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The ultimate control panel with docker (thanks lagun4ik for a great start) What's included? * ubuntu 16.04 lts + Vesta 0.9.8-18 -* nginx (proxy) -> apache2 -> php7.1 - high performance and flexible implementation +* nginx (proxy) -> apache2 -> php-fcgi - high performance and flexible implementation * added ability to also run php-fpm * ssh/sftp, letsencrypt, memcached, redis, MariaDB 10.1, postgresql 9.5, nodejs 8.x, golang 1.9, openvpn, mongodb, couchdb, .net core 2.0 runtime * folder redirection for data persistence and automatic daily backup provided by VestaCP @@ -75,7 +75,7 @@ If you use this Docker for hosting and allow your user to login, I also recommen Enjoy!!! ## Release Notes -1.0.7 - introducing vesta 0.9.8-18, please run */bin/vesta-update.sh* after update to this image to update Vesta. +1.0.8 - introducing vesta 0.9.8-18, update to this docker image then run */bin/vesta-update.sh* to update Vesta. 1.0.0 - introducing the recently released php7.2 diff --git a/docker-compose.yml b/docker-compose.yml index 4439237..fe8b348 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.3" services: vesta: - image: niiknow/vestacp:0.9.27 + image: niiknow/vestacp container_name: vesta volumes: - "/opt/vestacp/backup:/backup"