Skip to content
Snippets Groups Projects
Commit 955dd73b authored by Alan Nelson's avatar Alan Nelson
Browse files

Merge branch 'develop' into 'master'

Develop

See merge request !77
parents 90c28c83 42a82c15
Branches
No related tags found
1 merge request!77Develop
......@@ -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
####################
......
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"
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"]
......@@ -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 \
......
......@@ -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
......
......@@ -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
......
......@@ -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 \
......
......@@ -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 \
......
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"]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment