Commit 94d8912a authored by Alan Nelson's avatar Alan Nelson
Browse files

Merge branch 'updates' into 'develop'

Updates

See merge request !52
parents c6ec1020 a622311d
Make All Images:
stage: build
tags:
- linux
- dockerd
script:
- make
only:
variables:
- $BUILD_ALL == "true"
Make PHP Lint:
stage: build
tags:
......@@ -20,6 +9,8 @@ Make PHP Lint:
changes:
- php-lint/*
- php-lint/**/*
except:
- schedules
Make PHP Unit Test:
stage: build
......@@ -32,6 +23,8 @@ Make PHP Unit Test:
changes:
- php-unit-test/*
- php-unit-test/**/*
except:
- schedules
Make Android Build:
stage: build
......@@ -44,6 +37,8 @@ Make Android Build:
changes:
- android-build-server/*
- android-build-server/**/*
except:
- schedules
Make Static Code Analysis:
stage: build
......@@ -56,6 +51,8 @@ Make Static Code Analysis:
changes:
- static-code-analysis/*
- static-code-analysis/**/*
except:
- schedules
Make Alpine SSH Client:
stage: build
......@@ -80,6 +77,8 @@ Make Merge Request Check:
changes:
- merge-request-check/*
- merge-request-check/**/*
except:
- schedules
Make XML Lint:
stage: build
......@@ -92,6 +91,8 @@ Make XML Lint:
changes:
- xml-lint/*
- xml-lint/**/*
except:
- schedules
Make Dependency Check:
stage: build
......@@ -116,3 +117,5 @@ Make Detect Secrets:
changes:
- detect-secrets/*
- detect-secrets/**/*
except:
- schedules
......@@ -12,60 +12,67 @@
script:
- make publish
Publish All Images:
<<: *push_to_registry
only:
variables:
- $PUBLISH_ALL == "true"
Publish PHP Lint:
<<: *push_to_registry
variables:
IMG_NAME: "php-lint"
needs: ["Make PHP Lint"]
only:
refs:
- master
changes:
- php-lint/*
- php-lint/**/*
except:
- schedules
Publish PHP Unit Test:
<<: *push_to_registry
variables:
IMG_NAME: "php-unit-test"
needs: ["Make PHP Unit Test"]
only:
refs:
- master
changes:
- php-unit-test/*
- php-unit-test/**/*
except:
- schedules
Publish Android Build:
<<: *push_to_registry
variables:
IMG_NAME: "android-build-server"
needs: ["Make Android Build"]
only:
refs:
- master
changes:
- android-build-server/*
- android-build-server/**/*
except:
- schedules
Publish Static Code Analysis:
<<: *push_to_registry
variables:
IMG_NAME: "static-code-analysis"
needs: ["Make Static Code Analysis"]
only:
refs:
- master
changes:
- static-code-analysis/*
- static-code-analysis/**/*
except:
- schedules
Publish Alpine SSH Client:
<<: *push_to_registry
variables:
IMG_NAME: "alpine-ssh-client"
needs: ["Make Alpine SSH Client"]
only:
refs:
- master
......@@ -77,28 +84,35 @@ Publish Merge Check:
<<: *push_to_registry
variables:
IMG_NAME: "merge-request-check"
needs: ["Make Merge Request Check"]
only:
refs:
- master
changes:
- merge-request-check/*
- merge-request-check/**/*
except:
- schedules
Publish XML Lint:
<<: *push_to_registry
variables:
IMG_NAME: "xml-lint"
needs: ["Make XML Lint"]
only:
refs:
- master
changes:
- xml-lint/*
- xml-lint/**/*
except:
- schedules
Publish Dependency Check:
<<: *push_to_registry
variables:
IMG_NAME: "dependency-check"
needs: ["Make Dependency Check"]
only:
refs:
- master
......@@ -110,9 +124,12 @@ Publish Detect Secrets:
<<: *push_to_registry
variables:
IMG_NAME: "detect-secrets"
needs: ["Make Detect Secrets"]
only:
refs:
- master
changes:
- detect-secrets/*
- detect-secrets/**/*
except:
- schedules
......@@ -3,6 +3,7 @@ Test Container Versions:
tags:
- linux
- dockerd
needs: ["Make Static Code Analysis", "Make Detect Secrets", "Make Dependency Check"]
only:
- develop
script:
......@@ -15,6 +16,7 @@ Test PHP Lint:
tags:
- linux
- dockerd
needs: ["Make PHP Lint"]
only:
- develop
script:
......
......@@ -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_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_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_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
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
......@@ -47,8 +47,14 @@ php-lint_7.2: php-lint/7.2/Dockerfile
php-lint_7.3: php-lint/7.3/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:7.3 -f php-lint/7.3/Dockerfile php-lint
php-lint_latest: php-lint_7.3
docker tag ${REPO_ORG}/php-lint:7.3 ${REPO_ORG}/php-lint:latest
php-lint_7.4: php-lint/7.4/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-lint:7.4 -f php-lint/7.4/Dockerfile php-lint
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 Unit Test Images
####################
......@@ -67,8 +73,14 @@ php-unit-test_7.2: php-unit-test/7.2/Dockerfile
php-unit-test_7.3: php-unit-test/7.3/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:7.3 -f php-unit-test/7.3/Dockerfile php-unit-test
php-unit-test_latest: php-unit-test_7.3
docker tag ${REPO_ORG}/php-unit-test:7.3 ${REPO_ORG}/php-unit-test:latest
php-unit-test_7.4: php-unit-test/7.4/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/php-unit-test:7.4 -f php-unit-test/7.4/Dockerfile php-unit-test
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
# Mobile Applications
####################
......
FROM python:alpine
LABEL org.label-schema.name="Merge Requset Checker" \
ARG BUILD_DATE
ARG VCS_REF
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="Merge Requset Checker" \
org.label-schema.description="Checks merge requests against ITS criteria" \
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.schema-version="1.0" \
......
FROM php:7.4-alpine
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="PHP 7.4 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"]
FROM php:8.0-alpine
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="PHP 8.0 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"]
......@@ -13,6 +13,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug-2.5.0 \
&& docker-php-ext-enable xdebug \
&& apk del --no-cache $PHPIZE_DEPS
......
......@@ -13,6 +13,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug-2.9.0 \
&& docker-php-ext-enable xdebug \
&& apk del --no-cache $PHPIZE_DEPS
......
......@@ -13,7 +13,8 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache bash nodejs nodejs-npm libmcrypt-dev $PHPIZE_DEPS \
&& pecl install xdebug redis \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug-2.9.8 redis \
&& docker-php-ext-enable xdebug redis \
&& docker-php-ext-install mcrypt \
&& apk del --no-cache $PHPIZE_DEPS
......
......@@ -13,6 +13,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug redis \
&& docker-php-ext-enable xdebug redis \
&& apk del --no-cache $PHPIZE_DEPS
......
......@@ -13,6 +13,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
RUN apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug redis \
&& docker-php-ext-enable xdebug redis \
&& apk del --no-cache $PHPIZE_DEPS
......
FROM php:7.4-alpine
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="PHP 7.4 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 apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug 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 \
&& chmod 755 /usr/local/bin/composer
CMD ["bash"]
FROM php:8.0-alpine
ARG BUILD_DATE
ARG VCS_REF
ARG VERSION
LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="PHP 8.0 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 apk add --no-cache bash nodejs nodejs-npm $PHPIZE_DEPS \
&& pecl channel-update pecl.php.net \
&& pecl install xdebug 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 \
&& chmod 755 /usr/local/bin/composer
CMD ["bash"]
......@@ -12,7 +12,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.schema-version="1.0" \
maintainer="J.R. Barreras <barreras@unl.edu>"
ENV SONAR_SCANNER_VERSION 4.0.0.1744
ENV SONAR_SCANNER_VERSION 4.6.0.2311
WORKDIR /opt
......
FROM its-registry.unl.edu/unl-its/docker-ci/android-build-server
FROM its-registry.unl.edu/unl-its/docker-ci/android-build-server
ARG BUILD_DATE
ARG VCS_REF
......@@ -12,7 +12,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.schema-version="1.0" \
maintainer="Alan Nelson <alan.nelson@nebraska.edu>"
ENV SONAR_SCANNER_VERSION 4.0.0.1744
ENV SONAR_SCANNER_VERSION 4.6.0.2311
ENV SONAR_HOME /opt/sonar-scanner
ENV PATH ${PATH}:${SONAR_HOME}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment