Skip to content

Commit 326f3a8

Browse files
author
tchapi
committed
chore
1 parent cc04214 commit 326f3a8

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

.hadolint.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ignored:
2+
- DL3018 # We don't pin apk versions (Alpine is rolling)
3+
failure-threshold: error # Only fail on errors, not warnings

docker/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ RUN docker-php-ext-configure intl \
4848
&& docker-php-ext-configure gd --with-freetype \
4949
&& docker-php-ext-configure ldap \
5050
&& docker-php-ext-configure zip \
51-
&& docker-php-ext-install -j$(nproc) \
51+
&& docker-php-ext-install -j"$(nproc)" \
5252
intl \
5353
pdo_mysql \
5454
pgsql \
@@ -87,7 +87,7 @@ RUN curl https://raw.githubusercontent.com/renatomefi/php-fpm-healthcheck/v0.5.0
8787
&& chmod +x /usr/local/bin/php-fpm-healthcheck
8888

8989
# Davis installation
90-
ADD --chown=${FPM_USER} . /var/www/davis
90+
COPY --chown=${FPM_USER} . /var/www/davis
9191
WORKDIR /var/www/davis
9292

9393
# Install Composer 2, then dependencies, compress the rather big INTL package

docker/Dockerfile-standalone

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN docker-php-ext-configure intl \
4747
&& docker-php-ext-configure gd --with-freetype \
4848
&& docker-php-ext-configure ldap \
4949
&& docker-php-ext-configure zip \
50-
&& docker-php-ext-install -j$(nproc) \
50+
&& docker-php-ext-install -j"$(nproc)" \
5151
intl \
5252
pdo_mysql \
5353
pgsql \
@@ -78,7 +78,7 @@ COPY --from=extension-builder /usr/local/lib/php/extensions /usr/local/lib/php/e
7878

7979
# Davis source
8080
# The app folder needs to be owned by www-data so PHP-fpm can execute files
81-
ADD --chown=www-data:www-data . /var/www/davis
81+
COPY --chown=www-data:www-data . /var/www/davis
8282
WORKDIR /var/www/davis
8383

8484
# Install Composer 2, then dependencies, compress the rather big INTL package
@@ -88,11 +88,11 @@ RUN APP_ENV=prod COMPOSER_ALLOW_SUPERUSER=1 composer install --no-ansi --no-dev
8888

8989
# Caddy: web server
9090
RUN mkdir -p /var/log/caddy
91-
ADD ./docker/configurations/Caddyfile /etc/caddy/Caddyfile
91+
COPY ./docker/configurations/Caddyfile /etc/caddy/Caddyfile
9292

9393
# Supervisor: Process manager
9494
RUN mkdir -p /var/log/supervisor && mkdir -p /var/log/php-fpm
95-
ADD ./docker/configurations/supervisord.conf /etc/supervisord.conf
95+
COPY ./docker/configurations/supervisord.conf /etc/supervisord.conf
9696

9797
# We want to use sockets inside the container between Caddy and PHP-fpm
9898
RUN mkdir /var/run/php-fpm && chown -R www-data:www-data /var/run/php-fpm

0 commit comments

Comments
 (0)