diff --git a/Dockerfile b/Dockerfile index e97327526..0b8e8f72a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,21 @@ FROM ubuntu:xenial -MAINTAINER Brady Wetherington +LABEL maintainer="uberbrady, hinchk" +RUN apt-get update && apt-get install -y software-properties-common +RUN LC_ALL=C.UTF-8 add-apt-repository -y ppa:ondrej/php RUN apt-get update && apt-get install -y \ apache2 \ apache2-bin \ -libapache2-mod-php7.0 \ -php7.0-curl \ -php7.0-ldap \ -php7.0-mysql \ -php7.0-mcrypt \ -php7.0-gd \ -php7.0-xml \ -php7.0-mbstring \ -php7.0-zip \ -php7.0-bcmath \ +libapache2-mod-php7.1 \ +php7.1-curl \ +php7.1-ldap \ +php7.1-mysql \ +php7.1-mcrypt \ +php7.1-gd \ +php7.1-xml \ +php7.1-mbstring \ +php7.1-zip \ +php7.1-bcmath \ patch \ curl \ vim \ @@ -27,8 +29,8 @@ RUN phpenmod mcrypt RUN phpenmod gd RUN phpenmod bcmath -RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/apache2/php.ini -RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.0/cli/php.ini +RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.1/apache2/php.ini +RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.1/cli/php.ini RUN useradd -m --uid 1000 --gid 50 docker