DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084)

Browse source 
* bump up to php7.1

& change deprecated MAINTAINER to a LABEL so it is visible with `docker inspect`

* AND modapache ><

* 2 updates required to get software-properties+ppa
This commit is contained in:
Kasey 2019-05-28 16:58:32 -07:00 committed by snipe
parent 6f2717a876
commit 186b94751d
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Dockerfile
View file

@ -1,19 +1,21 @@
FROM ubuntu:xenial FROM ubuntu:xenial
MAINTAINER Brady Wetherington <uberbrady@gmail.com> 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 \ RUN apt-get update && apt-get install -y \
apache2 \ apache2 \
apache2-bin \ apache2-bin \
libapache2-mod-php7.0 \ libapache2-mod-php7.1 \
php7.0-curl \ php7.1-curl \
php7.0-ldap \ php7.1-ldap \
php7.0-mysql \ php7.1-mysql \
php7.0-mcrypt \ php7.1-mcrypt \
php7.0-gd \ php7.1-gd \
php7.0-xml \ php7.1-xml \
php7.0-mbstring \ php7.1-mbstring \
php7.0-zip \ php7.1-zip \
php7.0-bcmath \ php7.1-bcmath \
patch \ patch \
curl \ curl \
vim \ vim \
@ -27,8 +29,8 @@ RUN phpenmod mcrypt
RUN phpenmod gd RUN phpenmod gd
RUN phpenmod bcmath 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.1/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/cli/php.ini
RUN useradd -m --uid 1000 --gid 50 docker RUN useradd -m --uid 1000 --gid 50 docker