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

Apply PR #3616 (Docker updates)

Browse source
This commit is contained in:
snipe 2017-06-01 20:53:01 -07:00
parent 74aaadcdc5
commit 2d3ea4eec6
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Dockerfile
View file

@ -1,14 +1,18 @@
FROM debian:jessie-slim FROM ubuntu:xenial
MAINTAINER Brady Wetherington <uberbrady@gmail.com> MAINTAINER Brady Wetherington <uberbrady@gmail.com>
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
apache2 \
apache2-bin \ apache2-bin \
libapache2-mod-php5 \ libapache2-mod-php7.0 \
php5-curl \ php7.0-curl \
php5-ldap \ php7.0-ldap \
php5-mysql \ php7.0-mysql \
php5-mcrypt \ php7.0-mcrypt \
php5-gd \ php7.0-gd \
php7.0-xml \
php7.0-mbstring \
php7.0-zip \
patch \ patch \
curl \ curl \
vim \ vim \
@ -17,13 +21,13 @@ mysql-client \
&& apt-get clean \ && apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN php5enmod mcrypt RUN phpenmod mcrypt
RUN php5enmod gd 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/php/7.0/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/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_USER=docker >> /etc/apache2/envvars
RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars RUN echo export APACHE_RUN_GROUP=staff >> /etc/apache2/envvars
@ -66,7 +70,9 @@ RUN \
RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer RUN cd /tmp;curl -sS https://getcomposer.org/installer | php;mv /tmp/composer.phar /usr/local/bin/composer
# Get dependencies # 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 ################# ############### APPLICATION INSTALL/INIT #################
@ -86,7 +92,13 @@ VOLUME ["/var/lib/snipeit"]
COPY docker/entrypoint.sh /entrypoint.sh COPY docker/entrypoint.sh /entrypoint.sh
RUN chmod +x /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 80
EXPOSE 443 EXPOSE 443

1
docker/entrypoint.sh
View file

@ -1,5 +1,4 @@
#!/bin/sh #!/bin/sh
cd /var/www/html
# fix key if needed # fix key if needed
if [ -z "$APP_KEY" ] if [ -z "$APP_KEY" ]