Skip to content

Commit 721d4e9

Browse files
committed
Refactor base functions upstream to docker-base
1 parent cf5a39a commit 721d4e9

File tree

8 files changed

+7
-12
lines changed

8 files changed

+7
-12
lines changed

.dockerignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33

44
# Allow files and folders with a pattern starting with !
55
!Dockerfile
6-
!conf
7-
!scripts
6+
!build

Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,20 @@ ENV PHP_FPM_APP_CONF_FILE $PHP_FPM_CONFD_DIR/zz_app.conf
1111
ENV PHP_FPM_ERROR_LOG /proc/self/fd/2
1212
ENV PHP_PID_DIR /var/run/php
1313

14-
COPY ./conf /conf
15-
COPY ./scripts /scripts
14+
COPY ./build /build
1615

1716
RUN apk --no-cache add php7 php7-fpm php7-json php7-zlib php7-xml php7-phar php7-iconv php7-mcrypt curl php7-curl php7-openssl php7-gd && \
1817
mkdir -p "$PHP_PID_DIR/" && \
1918
chown "$NGINX_RUN_USER":"$NGINX_RUN_GROUP" "$PHP_PID_DIR/" && \
2019
curl -sS https://getcomposer.org/installer | php -- --install-dir="$COMPOSER_PATH" --filename=composer && \
21-
cp /conf/nginx/app.conf "$NGINX_APP_CONF_FILE" && \
22-
cp /conf/php/app-php.ini "$PHP_APP_INI_FILE" && \
23-
cp /conf/php/app-php-fpm.conf "$PHP_FPM_APP_CONF_FILE" && \
20+
cp /build/conf/nginx/app.conf "$NGINX_APP_CONF_FILE" && \
21+
cp /build/conf/php/app-php.ini "$PHP_APP_INI_FILE" && \
22+
cp /build/conf/php/app-php-fpm.conf "$PHP_FPM_APP_CONF_FILE" && \
2423
rm -f $PHP_FPM_CONFD_DIR/www.conf && \
24+
cp -r /build/scripts/* /scripts/ && \
2525
chmod -R 755 /scripts
2626

27-
LABEL ca.unb.lib.generator="nginx" \
27+
LABEL ca.unb.lib.generator="php-fpm" \
2828
ca.unb.lib.php.version="7.4" \
2929
org.label-schema.build-date=$BUILD_DATE \
3030
org.label-schema.description="nginx-php is the base nginx/php-fpm image at UNB Libraries." \
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

scripts/pre-init.d/30_env_settings.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)