Skip to content

Commit

Permalink
docker: use ubuntu:xenial with php7.0 (#3616)
Browse files Browse the repository at this point in the history
Nice, thanks! I'll patch this over to develop as well.
  • Loading branch information
morph027 authored and snipe committed Jun 2, 2017
1 parent b81dd18 commit 7c8dc9f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 15 deletions.
40 changes: 26 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
FROM debian:jessie-slim
FROM ubuntu:xenial
MAINTAINER Brady Wetherington <[email protected]>

RUN apt-get update && apt-get install -y \
apache2 \
apache2-bin \
libapache2-mod-php5 \
php5-curl \
php5-ldap \
php5-mysql \
php5-mcrypt \
php5-gd \
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 \
patch \
curl \
vim \
Expand All @@ -17,13 +21,13 @@ mysql-client \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

RUN php5enmod mcrypt
RUN php5enmod gd
RUN phpenmod mcrypt
RUN phpenmod gd

RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/apache2/php.ini
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php5/cli/php.ini
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 useradd --uid 1000 --gid 50 docker
RUN useradd -m --uid 1000 --gid 50 docker

RUN echo export APACHE_RUN_USER=docker >> /etc/apache2/envvars
RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
Expand Down Expand Up @@ -66,7 +70,9 @@ RUN \
RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer

# Get dependencies
RUN cd /var/www/html;composer install
USER docker
RUN cd /var/www/html;composer install && rm -rf /home/docker/.composer/cache
USER root

############### APPLICATION INSTALL/INIT #################

Expand All @@ -86,7 +92,13 @@ VOLUME ["/var/lib/snipeit"]
COPY docker/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh

ENTRYPOINT ["/entrypoint.sh"]
# Add Tini
ENV TINI_VERSION v0.14.0
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
RUN chmod +x /tini
ENTRYPOINT ["/tini", "--"]

CMD ["/entrypoint.sh"]

EXPOSE 80
EXPOSE 443
1 change: 0 additions & 1 deletion docker/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/sh
cd /var/www/html

# fix key if needed
if [ -z "$APP_KEY" ]
Expand Down

0 comments on commit 7c8dc9f

Please sign in to comment.