diff --git a/Makefile b/Makefile
index 61eb9fb585951882922fc504054a91c9d1b82464..69a643d2bc8ae64c1f8b134a7ac4da74c5724b22 100644
--- a/Makefile
+++ b/Makefile
@@ -24,8 +24,8 @@ all: php-lint php-unit-test mobile static-code-analysis utility detect-secrets d
# Image Groups
####################
-php-lint: php-lint_5.6 php-lint_7.0 php-lint_7.1 php-lint_7.2 php-lint_7.3 php-lint_7.4 php-lint_8.0 php-lint_latest
-php-unit-test: php-unit-test_5.6 php-unit-test_7.0 php-unit-test_7.1 php-unit-test_7.2 php-unit-test_7.3 php-unit-test_7.4 php-unit-test_8.0 php-unit-test_latest
+php-lint: php-lint_5.6 php-lint_7.0 php-lint_7.1 php-lint_7.2 php-lint_7.3 php-lint_7.4 php-lint_8.0 php-lint_8.1 php-lint_8.2 php-lint_latest
+php-unit-test: php-unit-test_5.6 php-unit-test_7.0 php-unit-test_7.1 php-unit-test_7.2 php-unit-test_7.3 php-unit-test_7.4 php-unit-test_8.0 php-unit-test_8.1 php-unit-test_8.2 php-unit-test_latest
mobile: android-build-server
static-code-analysis: static-code-analysis_latest static-code-analysys_php static-code-analysys_python static-code-analysys_android
utility: alpine-ssh-client merge-request-check
@@ -57,8 +57,11 @@ php-lint_8.0: php-lint/8.0/Dockerfile
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-lint_8.2: php-lint/8.2/Dockerfile
+ docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:8.2 -f php-lint/8.2/Dockerfile php-lint
+
+php-lint_latest: php-lint_8.2
+ docker tag ${REPO_ORG}/php-lint:8.2 ${REPO_ORG}/php-lint:latest
# PHP Unit Test Images
####################
@@ -86,8 +89,11 @@ php-unit-test_8.0: php-unit-test/8.0/Dockerfile
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
+php-unit-test_8.2: php-unit-test/8.2/Dockerfile
+ docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:8.2 -f php-unit-test/8.2/Dockerfile php-unit-test
+
+php-unit-test_latest: php-unit-test_8.2
+ docker tag ${REPO_ORG}/php-unit-test:8.2 ${REPO_ORG}/php-unit-test:latest
# Mobile Applications
####################
diff --git a/android-build-server/Dockerfile b/android-build-server/Dockerfile
index 148f1056a23d2efb85b549b934feec838d863fa6..edd15920d958b23a766c5d2f2161de0a8c9c7db7 100644
--- a/android-build-server/Dockerfile
+++ b/android-build-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8:alpine
+FROM adoptopenjdk/openjdk11:alpine
ARG BUILD_DATE
ARG VCS_REF
@@ -8,25 +8,26 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.description="Docker image for building Android projects" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vendor="University of Nebraska - Lincoln" \
- org.label-schema.version="0.1.0" \
+ org.label-schema.version="0.2.0" \
org.label-schema.schema-version="1.0" \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
-ENV ANDROID_SDK_VERSION 4333796
ENV ANDROID_HOME /opt/android-sdk-linux
-ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools
+ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/bin:${ANDROID_HOME}/platform-tools:${ANDROID_HOME}/cmdline-tools/latest/bin
WORKDIR /opt
RUN apk add --no-cache curl bash unzip libstdc++ su-exec
-RUN mkdir -p /opt/android-sdk-linux \
- && curl -q -o android-sdk-tools.zip -L https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_VERSION}.zip \
- && unzip -q android-sdk-tools.zip -d ${ANDROID_HOME} \
- && rm -f android-sdk-tools.zip \
- && yes | sdkmanager --licenses
+RUN mkdir -p /opt/android-sdk-linux/cmdline-tools \
+ && curl -q -o commandlinetools.zip -L https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip \
+ && unzip -q commandlinetools.zip -d ${ANDROID_HOME}/cmdline-tools \
+ && mv ${ANDROID_HOME}/cmdline-tools/cmdline-tools ${ANDROID_HOME}/cmdline-tools/latest \
+ && rm -f commandlinetools.zip
+RUN sdkmanager "platform-tools"
+RUN yes | sdkmanager --licenses
COPY entrypoint.sh /usr/local/bin/
RUN chmod +x /usr/local/bin/entrypoint.sh
ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD "/bin/bash"
\ No newline at end of file
+CMD "/bin/bash"
diff --git a/php-lint/8.2/Dockerfile b/php-lint/8.2/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..0878a660d42a56a60920002acf918a7e3fb4896b
--- /dev/null
+++ b/php-lint/8.2/Dockerfile
@@ -0,0 +1,21 @@
+FROM php:8.2-alpine
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+ org.label-schema.name="PHP 8.2 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"]
diff --git a/php-unit-test/7.2/Dockerfile b/php-unit-test/7.2/Dockerfile
index 3f5705d0481a70a9a12c15125ec7814150a8302a..4615de0463273b30e5284b4b489ab4ed1b06cd80 100644
--- a/php-unit-test/7.2/Dockerfile
+++ b/php-unit-test/7.2/Dockerfile
@@ -14,7 +14,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
- && pecl install xdebug redis \
+ && pecl install xdebug-3.1.6 redis \
&& docker-php-ext-enable xdebug redis \
&& apk del --no-cache $PHPIZE_DEPS
RUN curl -o /usr/local/bin/composer https://getcomposer.org/composer.phar \
diff --git a/php-unit-test/7.3/Dockerfile b/php-unit-test/7.3/Dockerfile
index 23d6386c1d91210160b3504a464daec73eda2901..1e7a5e533fdbf1931025bb35673ba5c6fa9ade5f 100644
--- a/php-unit-test/7.3/Dockerfile
+++ b/php-unit-test/7.3/Dockerfile
@@ -15,7 +15,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN export BUILD_DEPS="bzip2-dev icu-dev libpng-dev libzip-dev openldap-dev" \
&& apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS $BUILD_DEPS \
&& pecl channel-update pecl.php.net \
- && pecl install xdebug redis \
+ && pecl install xdebug-3.1.6 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
diff --git a/php-unit-test/7.4/Dockerfile b/php-unit-test/7.4/Dockerfile
index e547b9ec75680b2b030f54ce6e101638edd91006..80c63c587bc775c765ade4e12248f28ac400b30f 100644
--- a/php-unit-test/7.4/Dockerfile
+++ b/php-unit-test/7.4/Dockerfile
@@ -15,7 +15,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN export BUILD_DEPS="bzip2-dev icu-dev libpng-dev libzip-dev openldap-dev" \
&& apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS $BUILD_DEPS \
&& pecl channel-update pecl.php.net \
- && pecl install xdebug redis \
+ && pecl install xdebug-3.1.6 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
diff --git a/php-unit-test/8.0/Dockerfile b/php-unit-test/8.0/Dockerfile
index f5721ebf9d94a7feff19ddc20bd94d762e0ce33f..52c9e491a0288b15e04061ebbbdbe86f0ab9731c 100644
--- a/php-unit-test/8.0/Dockerfile
+++ b/php-unit-test/8.0/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
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 nodejs-npm $PHPIZE_DEPS $BUILD_DEPS \
+ && apk add --no-cache bash nodejs nodejs-npm linux-headers $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 \
diff --git a/php-unit-test/8.1/Dockerfile b/php-unit-test/8.1/Dockerfile
index 77db17120d5079d7c84df1a70aaf4f3156c4184c..0eceb72a40cd437ee72501f2bcdd2650e4bb3b39 100644
--- a/php-unit-test/8.1/Dockerfile
+++ b/php-unit-test/8.1/Dockerfile
@@ -13,7 +13,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
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 \
+ && apk add --no-cache bash nodejs npm linux-headers $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 \
diff --git a/php-unit-test/8.2/Dockerfile b/php-unit-test/8.2/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..a4dd31fb745aa92249b609f107cf9c9f4afad86e
--- /dev/null
+++ b/php-unit-test/8.2/Dockerfile
@@ -0,0 +1,25 @@
+FROM php:8.2-alpine
+
+ARG BUILD_DATE
+ARG VCS_REF
+ARG VERSION
+LABEL org.label-schema.build-date=$BUILD_DATE \
+ org.label-schema.name="PHP 8.2 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 linux-headers $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"]