Skip to content
This repository has been archived by the owner on Jan 26, 2022. It is now read-only.

Commit

Permalink
vesta update
Browse files Browse the repository at this point in the history
  • Loading branch information
noogen committed Feb 1, 2018
1 parent 6da7d3f commit 836ee21
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 24 deletions.
29 changes: 5 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,22 @@ RUN \
&& apt-get install -yq php5.6-mbstring php5.6-cgi php5.6-cli php5.6-dev php5.6-geoip php5.6-common php5.6-xmlrpc php5.6-sybase \
php5.6-curl php5.6-enchant php5.6-imap php5.6-xsl php5.6-mysql php5.6-mysqlnd php5.6-pspell php5.6-gd php5.6-zip \
php5.6-tidy php5.6-opcache php5.6-json php5.6-bz2 php5.6-pgsql php5.6-mcrypt php5.6-readline php5.6-imagick \
php5.6-intl php5.6-sqlite3 php5.6-ldap php5.6-xml php5.6-redis php5.6-dev php5.6-fpm \
php5.6-intl php5.6-sqlite3 php5.6-ldap php5.6-xml php5.6-redis php5.6-dev php5.6-fpm php5.6-soap \

&& apt-get install -yq php7.0-mbstring php7.0-cgi php7.0-cli php7.0-dev php7.0-geoip php7.0-common php7.0-xmlrpc php7.0-sybase \
php7.0-curl php7.0-enchant php7.0-imap php7.0-xsl php7.0-mysql php7.0-mysqlnd php7.0-pspell php7.0-gd php7.0-zip \
php7.0-tidy php7.0-opcache php7.0-json php7.0-bz2 php7.0-pgsql php7.0-mcrypt php7.0-readline php7.0-imagick \
php7.0-intl php7.0-sqlite3 php7.0-ldap php7.0-xml php7.0-redis php7.0-dev php7.0-fpm php7.0-sodium \
php7.0-intl php7.0-sqlite3 php7.0-ldap php7.0-xml php7.0-redis php7.0-dev php7.0-fpm php7.0-sodium php7.0-soap \

&& apt-get install -yq php7.1-mbstring php7.1-cgi php7.1-cli php7.1-dev php7.1-geoip php7.1-common php7.1-xmlrpc php7.1-sybase \
php7.1-curl php7.1-enchant php7.1-imap php7.1-xsl php7.1-mysql php7.1-mysqlnd php7.1-pspell php7.1-gd php7.1-zip \
php7.1-tidy php7.1-opcache php7.1-json php7.1-bz2 php7.1-pgsql php7.1-mcrypt php7.1-readline php7.1-imagick \
php7.1-intl php7.1-sqlite3 php7.1-ldap php7.1-xml php7.1-redis php7.1-dev php7.1-fpm php7.1-sodium \
php7.1-intl php7.1-sqlite3 php7.1-ldap php7.1-xml php7.1-redis php7.1-dev php7.1-fpm php7.1-sodium php7.1-soap \

&& apt-get install -yq php7.2-mbstring php7.2-cgi php7.2-cli php7.2-dev php7.2-geoip php7.2-common php7.2-xmlrpc php7.2-sybase \
php7.2-curl php7.2-enchant php7.2-imap php7.2-xsl php7.2-mysql php7.2-mysqlnd php7.2-pspell php7.2-gd php7.2-zip \
php7.2-tidy php7.2-opcache php7.2-json php7.2-bz2 php7.2-pgsql php7.2-readline php7.2-imagick \
php7.2-intl php7.2-sqlite3 php7.2-ldap php7.2-xml php7.2-redis php7.2-dev php7.2-fpm \
php7.2-intl php7.2-sqlite3 php7.2-ldap php7.2-xml php7.2-redis php7.2-dev php7.2-fpm php7.2-soap \

# put back old source list for vesta
&& rm -f /etc/apt/sources.list && mv /etc/apt/sources.list.bak /etc/apt/sources.list \
Expand Down Expand Up @@ -183,25 +183,6 @@ RUN \
&& chmod +x /etc/my_init.d/startup.sh \
&& mv /sysprepz/admin/bin/vesta-*.sh /bin \

&& echo "extension=igbinary.so" > /etc/php/7.0/mods-available/igbinary.ini \
&& ln -sf /etc/php/7.0/mods-available/igbinary.ini /etc/php/7.0/apache2/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.0/mods-available/igbinary.ini /etc/php/7.0/cli/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.0/mods-available/igbinary.ini /etc/php/7.0/cgi/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.0/mods-available/igbinary.ini /etc/php/7.0/fpm/conf.d/15-igbinary.ini \

&& echo "extension=igbinary.so" > /etc/php/7.1/mods-available/igbinary.ini \
&& ln -sf /etc/php/7.1/mods-available/igbinary.ini /etc/php/7.1/apache2/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.1/mods-available/igbinary.ini /etc/php/7.1/cli/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.1/mods-available/igbinary.ini /etc/php/7.1/cgi/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.1/mods-available/igbinary.ini /etc/php/7.1/fpm/conf.d/15-igbinary.ini \

&& echo "extension=igbinary.so" > /etc/php/7.2/mods-available/igbinary.ini \
&& ln -sf /etc/php/7.2/mods-available/igbinary.ini /etc/php/7.2/apache2/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.2/mods-available/igbinary.ini /etc/php/7.2/cli/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.2/mods-available/igbinary.ini /etc/php/7.2/cgi/conf.d/15-igbinary.ini \
&& ln -sf /etc/php/7.2/mods-available/igbinary.ini /etc/php/7.2/fpm/conf.d/15-igbinary.ini \


&& echo "extension=v8js.so" > /etc/php/5.6/mods-available/v8js.ini \
&& ln -sf /etc/php/5.6/mods-available/v8js.ini /etc/php/5.6/apache2/conf.d/20-v8js.ini \
&& ln -sf /etc/php/5.6/mods-available/v8js.ini /etc/php/5.6/cli/conf.d/20-v8js.ini \
Expand Down Expand Up @@ -256,7 +237,7 @@ RUN \
&& ln -sf /etc/php/5.6/mods-available/couchbase.ini /etc/php/5.6/apache2/conf.d/30-couchbase.ini \
&& ln -sf /etc/php/5.6/mods-available/couchbase.ini /etc/php/5.6/cli/conf.d/30-couchbase.ini \
&& ln -sf /etc/php/5.6/mods-available/couchbase.ini /etc/php/5.6/cgi/conf.d/30-couchbase.ini \
&& ln -sf /etc/php/5.6/mods-available/couchbase.ini /etc/php/5.6/fpm/conf.d/20-couchbase.ini \
&& ln -sf /etc/php/5.6/mods-available/couchbase.ini /etc/php/5.6/fpm/conf.d/30-couchbase.ini \

&& echo "extension=couchbase.so" > /etc/php/7.0/mods-available/couchbase.ini \
&& ln -sf /etc/php/7.0/mods-available/couchbase.ini /etc/php/7.0/apache2/conf.d/30-couchbase.ini \
Expand Down
4 changes: 4 additions & 0 deletions rootfs/sysprepz/admin/bin/vesta-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ rsync --update -raz --progress --exclude 'data' --exclude 'log' --exclude 'conf'
rsync --update -raz --progress /vesta-start/local/vesta/data/templates /usr/local/vesta/data/templates

rsync --update -raz --progress --exclude 'conf.d' /vesta-start/etc/nginx /etc/nginx

# update php conf
rm -rf /vesta/etc/php/*
rsync --update -raz --progress /vesta-start/etc/php/ /vesta/etc/php/

0 comments on commit 836ee21

Please sign in to comment.