Compare commits

...

5 Commits

Author SHA1 Message Date
snipe db76090e10 Missed one 2019-05-28 19:12:53 -07:00
snipe 03cf3b5431 Bumped release again :( 2019-05-28 19:12:42 -07:00
snipe 40f101d471 Merge branch 'master' of https://github.com/snipe/snipe-it 2019-05-28 19:08:39 -07:00
snipe 7aa6ef5f6c Bumped version 2019-05-28 19:08:35 -07:00
Kasey 186b94751d Dockerfile update to bring us up to php v7.1 for Laravel 5.5 (#7084)
* 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
2019-05-28 16:58:32 -07:00
2 changed files with 18 additions and 16 deletions
+15 -13
View File
@@ -1,19 +1,21 @@
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 \
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
+3 -3
View File
@@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v4.7.0',
'full_app_version' => 'v4.7.0 - build 4037',
'app_version' => 'v4.7.2',
'full_app_version' => 'v4.7.2 - build 4037',
'build_version' => '4037',
'prerelease_version' => '',
'hash_version' => '',
'full_hash' => 'v4.7.0',
'full_hash' => 'v4.7.2',
'branch' => 'master',
);