Merge branch 'develop' into 'master'

Develop

See merge request !72

Makefile

@@ -54,8 +54,11 @@ php-lint_7.4: php-lint/7.4/Dockerfile
 php-lint_8.0: php-lint/8.0/Dockerfile
 	docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:8.0 -f php-lint/8.0/Dockerfile php-lint
 
-php-lint_latest: php-lint_8.0
-	docker tag  ${REPO_ORG}/php-lint:8.0 ${REPO_ORG}/php-lint:latest
+php-lint_8.1: php-lint/8.1/Dockerfile
+	docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:8.1 -f php-lint/8.1/Dockerfile php-lint
+
+php-lint_latest: php-lint_8.1
+	docker tag  ${REPO_ORG}/php-lint:8.1 ${REPO_ORG}/php-lint:latest
 
 # PHP Unit Test Images
 ####################
@@ -80,8 +83,11 @@ php-unit-test_7.4: php-unit-test/7.4/Dockerfile
 php-unit-test_8.0: php-unit-test/8.0/Dockerfile
 	docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:8.0 -f php-unit-test/8.0/Dockerfile php-unit-test
 
-php-unit-test_latest: php-unit-test_8.0
-	docker tag ${REPO_ORG}/php-unit-test:8.0 ${REPO_ORG}/php-unit-test:latest
+php-unit-test_8.1: php-unit-test/8.1/Dockerfile
+	docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:8.1 -f php-unit-test/8.1/Dockerfile php-unit-test
+
+php-unit-test_latest: php-unit-test_8.1
+	docker tag ${REPO_ORG}/php-unit-test:8.1 ${REPO_ORG}/php-unit-test:latest
 
 # Mobile Applications
 ####################

php-lint/8.1/Dockerfile

+FROM php:8.1-alpine
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="PHP 8.1 linter" \
+      org.label-schema.description="" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vendor="University of Nebraska - Lincoln" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0" \
+      maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
+
+RUN apk add --no-cache bash
+
+COPY php-lint docker-entrypoint /usr/local/bin/
+RUN chmod 755 /usr/local/bin/docker-entrypoint /usr/local/bin/php-lint
+
+ENTRYPOINT ["docker-entrypoint"]
+CMD ["--help"]

php-unit-test/8.1/Dockerfile

+FROM php:8.1-alpine
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name="PHP 8.1 Unit Tester" \
+      org.label-schema.description="" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vendor="University of Nebraska - Lincoln" \
+      org.label-schema.version=$VERSION \
+      org.label-schema.schema-version="1.0" \
+      maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
+
+RUN export BUILD_DEPS="bzip2-dev icu-dev libpng-dev libzip-dev openldap-dev" \
+    && apk add --no-cache bash nodejs npm $PHPIZE_DEPS $BUILD_DEPS \
+    && pecl channel-update pecl.php.net \
+    && pecl install xdebug redis \
+    && docker-php-ext-install bz2 gd intl ldap mysqli pdo_mysql zip \
+    && docker-php-ext-enable xdebug redis \
+    && apk del --no-cache $PHPIZE_DEPS
+RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
+  && chmod 755 /usr/local/bin/composer
+
+CMD ["bash"]