docker: cleanup, install shadow-utils

This commit is contained in:
Matthew Penner 2022-11-27 12:41:35 -07:00
parent 490690f1d0
commit db4aa86fbc
No known key found for this signature in database

View file

@ -29,23 +29,22 @@ COPY --chown=1001:0 artisan CHANGELOG.md composer.json composer.lock LICE
# Stage 2 - Final # Stage 2 - Final
FROM registry.access.redhat.com/ubi9/ubi-minimal FROM registry.access.redhat.com/ubi9/ubi-minimal
RUN useradd --home-dir /var/lib/caddy --create-home caddy \ RUN microdnf update -y \
&& microdnf update -y \
&& rpm --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \ && rpm --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
&& rpm --install https://rpms.remirepo.net/enterprise/remi-release-9.rpm \ && rpm --install https://rpms.remirepo.net/enterprise/remi-release-9.rpm \
&& microdnf update -y \ && microdnf update -y \
&& microdnf install -y ca-certificates tar tzdata unzip wget \ && microdnf install -y ca-certificates shadow-utils tar tzdata unzip wget \
&& microdnf module -y reset php \ && microdnf module -y reset php \
&& microdnf module -y enable php:remi-8.1 \ && microdnf module -y enable php:remi-8.1 \
&& microdnf install -y cronie php-{bcmath,cli,common,fpm,gd,gmp,intl,json,mbstring,mysqlnd,opcache,pdo,pecl-redis5,pecl-zip,phpiredis,pgsql,process,sodium,xml,zstd} supervisor \ && microdnf install -y cronie php-{bcmath,cli,common,fpm,gd,gmp,intl,json,mbstring,mysqlnd,opcache,pdo,pecl-redis5,pecl-zip,phpiredis,pgsql,process,sodium,xml,zstd} supervisor \
&& rm /etc/php-fpm.d/www.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& microdnf remove -y tar \ && rm /etc/php-fpm.d/www.conf \
&& microdnf clean all \ && useradd --home-dir /var/lib/caddy --create-home caddy \
&& mkdir /etc/caddy \ && mkdir /etc/caddy \
&& wget -O /usr/local/bin/yacron https://github.com/gjcarneiro/yacron/releases/download/0.17.0/yacron-0.17.0-x86_64-unknown-linux-gnu && wget -O /usr/local/bin/yacron https://github.com/gjcarneiro/yacron/releases/download/0.17.0/yacron-0.17.0-x86_64-unknown-linux-gnu \
&& chmod 755 /usr/local/bin/yacron \
RUN chmod 755 /usr/local/bin/yacron && microdnf remove -y tar wget \
&& microdnf clean all
COPY --chown=caddy:caddy --from=builder /var/www/pterodactyl /var/www/pterodactyl COPY --chown=caddy:caddy --from=builder /var/www/pterodactyl /var/www/pterodactyl
@ -65,8 +64,6 @@ ENV USER=caddy
RUN composer install --no-dev --optimize-autoloader \ RUN composer install --no-dev --optimize-autoloader \
&& rm -rf bootstrap/cache/*.php \ && rm -rf bootstrap/cache/*.php \
# && php artisan route:cache \
# && php artisan view:cache \
&& rm -rf .env storage/logs/*.log && rm -rf .env storage/logs/*.log
COPY --from=caddy /usr/bin/caddy /usr/local/bin/caddy COPY --from=caddy /usr/bin/caddy /usr/local/bin/caddy