mirror of
https://github.com/snipe/snipe-it.git
synced 2025-03-05 20:52:15 -08:00
Merge pull request #16293 from uberbrady/fix_default_docker_image
Updated default Dockerfile to handle newer PHP versions
This commit is contained in:
commit
3fb00a9fa9
32
Dockerfile
32
Dockerfile
|
@ -1,4 +1,4 @@
|
||||||
FROM ubuntu:22.04
|
FROM ubuntu:24.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-php8.1 \
|
libapache2-mod-php8.3 \
|
||||||
php8.1-curl \
|
php8.3-curl \
|
||||||
php8.1-ldap \
|
php8.3-ldap \
|
||||||
php8.1-mysql \
|
php8.3-mysql \
|
||||||
php8.1-gd \
|
php8.3-gd \
|
||||||
php8.1-xml \
|
php8.3-xml \
|
||||||
php8.1-mbstring \
|
php8.3-mbstring \
|
||||||
php8.1-zip \
|
php8.3-zip \
|
||||||
php8.1-bcmath \
|
php8.3-bcmath \
|
||||||
php8.1-redis \
|
php8.3-redis \
|
||||||
php-memcached \
|
php-memcached \
|
||||||
patch \
|
patch \
|
||||||
curl \
|
curl \
|
||||||
|
@ -41,7 +41,7 @@ libc-dev \
|
||||||
libldap-common \
|
libldap-common \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libmcrypt-dev \
|
libmcrypt-dev \
|
||||||
php8.1-dev \
|
php8.3-dev \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
unzip \
|
unzip \
|
||||||
dnsutils \
|
dnsutils \
|
||||||
|
@ -53,16 +53,16 @@ RUN php go-pear.phar
|
||||||
|
|
||||||
RUN pecl install mcrypt
|
RUN pecl install mcrypt
|
||||||
|
|
||||||
RUN bash -c "echo extension=/usr/lib/php/20210902/mcrypt.so > /etc/php/8.1/mods-available/mcrypt.ini"
|
RUN bash -c "echo extension=/usr/lib/php/20210902/mcrypt.so > /etc/php/8.3/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/8.1/apache2/php.ini
|
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.3/apache2/php.ini
|
||||||
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.1/cli/php.ini
|
RUN sed -i 's/variables_order = .*/variables_order = "EGPCS"/' /etc/php/8.3/cli/php.ini
|
||||||
|
|
||||||
RUN useradd -m --uid 1000 --gid 50 docker
|
RUN useradd -m --uid 10000 --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
|
||||||
|
|
Loading…
Reference in a new issue