DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 15:44:11 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/snipe/snipe-it into develop

Browse source
This commit is contained in:
snipe 2023-04-15 16:48:07 -07:00
parent b690ed97d5 36665fde31
commit f407a551da
3 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:20.04 FROM ubuntu:22.04
LABEL maintainer="Brady Wetherington <bwetherington@grokability.com>" LABEL maintainer="Brady Wetherington <bwetherington@grokability.com>"
# No need to add `apt-get clean` here, reference: # No need to add `apt-get clean` here, reference:
@ -14,16 +14,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
apt-utils \ apt-utils \
apache2 \ apache2 \
apache2-bin \ apache2-bin \
libapache2-mod-php7.4 \ libapache2-mod-php8.1 \
php7.4-curl \ php8.1-curl \
php7.4-ldap \ php8.1-ldap \
php7.4-mysql \ php8.1-mysql \
php7.4-gd \ php8.1-gd \
php7.4-xml \ php8.1-xml \
php7.4-mbstring \ php8.1-mbstring \
php7.4-zip \ php8.1-zip \
php7.4-bcmath \ php8.1-bcmath \
php7.4-redis \ php8.1-redis \
php-memcached \ php-memcached \
patch \ patch \
curl \ curl \
@ -40,7 +40,7 @@ autoconf \
libc-dev \ libc-dev \
pkg-config \ pkg-config \
libmcrypt-dev \ libmcrypt-dev \
php7.4-dev \ php8.1-dev \
ca-certificates \ ca-certificates \
unzip \ unzip \
dnsutils \ dnsutils \
@ -50,16 +50,16 @@ dnsutils \
RUN curl -L -O https://github.com/pear/pearweb_phars/raw/master/go-pear.phar RUN curl -L -O https://github.com/pear/pearweb_phars/raw/master/go-pear.phar
RUN php go-pear.phar RUN php go-pear.phar
RUN pecl install mcrypt-1.0.3 RUN pecl install mcrypt
RUN bash -c "echo extension=/usr/lib/php/20190902/mcrypt.so > /etc/php/7.4/mods-available/mcrypt.ini" RUN bash -c "echo extension=/usr/lib/php/20210902/mcrypt.so > /etc/php/8.1/mods-available/mcrypt.ini"
RUN phpenmod mcrypt 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.4/apache2/php.ini RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.1/apache2/php.ini
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/7.4/cli/php.ini RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.1/cli/php.ini
RUN useradd -m --uid 1000 --gid 50 docker RUN useradd -m --uid 1000 --gid 50 docker

58
Dockerfile.alpine
View file

@ -1,34 +1,34 @@
FROM alpine:3.14.2 FROM alpine:3.17.3
# Apache + PHP # Apache + PHP
RUN apk add --no-cache \ RUN apk add --no-cache \
apache2 \ apache2 \
php7 \ php81 \
php7-common \ php81-common \
php7-apache2 \ php81-apache2 \
php7-curl \ php81-curl \
php7-ldap \ php81-ldap \
php7-mysqli \ php81-mysqli \
php7-gd \ php81-gd \
php7-xml \ php81-xml \
php7-mbstring \ php81-mbstring \
php7-zip \ php81-zip \
php7-ctype \ php81-ctype \
php7-tokenizer \ php81-tokenizer \
php7-pdo_mysql \ php81-pdo_mysql \
php7-openssl \ php81-openssl \
php7-bcmath \ php81-bcmath \
php7-phar \ php81-phar \
php7-json \ php81-json \
php7-iconv \ php81-iconv \
php7-fileinfo \ php81-fileinfo \
php7-simplexml \ php81-simplexml \
php7-session \ php81-session \
php7-dom \ php81-dom \
php7-xmlwriter \ php81-xmlwriter \
php7-xmlreader \ php81-xmlreader \
php7-sodium \ php81-sodium \
php7-redis \ php81-redis \
php7-pecl-memcached \ php81-pecl-memcached \
curl \ curl \
wget \ wget \
vim \ vim \
@ -41,7 +41,7 @@ COPY docker/column-statistics.cnf /etc/mysql/conf.d/column-statistics.cnf
# Where apache's PID lives # Where apache's PID lives
RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2 RUN mkdir -p /run/apache2 && chown apache:apache /run/apache2
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php7/php.ini RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php81/php.ini
COPY docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf COPY docker/000-default-2.4.conf /etc/apache2/conf.d/default.conf
# Enable mod_rewrite # Enable mod_rewrite

10
Dockerfile.fpm-alpine
View file

@ -1,8 +1,8 @@
ARG ENVIRONMENT=production ARG ENVIRONMENT=production
ARG SNIPEIT_RELEASE=5.1.3 ARG SNIPEIT_RELEASE=6.1.0
ARG PHP_VERSION=7.4.16 ARG PHP_VERSION=8.2
ARG PHP_ALPINE_VERSION=3.13 ARG PHP_ALPINE_VERSION=3.17
ARG COMPOSER_VERSION=2.0.11 ARG COMPOSER_VERSION=2
# Cannot use arguments with 'COPY --from' workaround # Cannot use arguments with 'COPY --from' workaround
# https://github.com/moby/moby/issues/34482#issuecomment-454716952 # https://github.com/moby/moby/issues/34482#issuecomment-454716952
@ -52,7 +52,7 @@ RUN { \
# Install php extensions inside docker containers easily # Install php extensions inside docker containers easily
# https://github.com/mlocati/docker-php-extension-installer # https://github.com/mlocati/docker-php-extension-installer
COPY --from=mlocati/php-extension-installer:1.2.19 /usr/bin/install-php-extensions /usr/local/bin/ COPY --from=mlocati/php-extension-installer:2.1.15 /usr/bin/install-php-extensions /usr/local/bin/
RUN set -eux; \ RUN set -eux; \
install-php-extensions \ install-php-extensions \
bcmath \ bcmath \