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

Merge branch 'develop'

parents 0c90577c 889d89a7
No related branches found
No related tags found
1 merge request!81Develop
...@@ -122,7 +122,7 @@ xml-lint: xml-lint/Dockerfile ...@@ -122,7 +122,7 @@ xml-lint: xml-lint/Dockerfile
# Utility Images # Utility Images
#################### ####################
alpine-ssh-client: alpine-ssh-client/Dockerfile alpine-ssh-client: alpine-ssh-client/Dockerfile
docker build $(BUILD_ARGS) --no-cache -t ${REPO_ORG}/alpine-ssh-client:latest alpine-ssh-client/ docker build $(BUILD_ARGS) -t ${REPO_ORG}/alpine-ssh-client:latest --no-cache alpine-ssh-client/
merge-request-check: merge-request-check/Dockerfile merge-request-check: merge-request-check/Dockerfile
docker build $(BUILD_ARGS) -t ${REPO_ORG}/merge-request-check:latest merge-request-check/ docker build $(BUILD_ARGS) -t ${REPO_ORG}/merge-request-check:latest merge-request-check/
...@@ -173,7 +173,7 @@ README_HEAD = `cat ./_README.md | sed -e '/%CONTAINERS_LIST%/Q'` ...@@ -173,7 +173,7 @@ README_HEAD = `cat ./_README.md | sed -e '/%CONTAINERS_LIST%/Q'`
README_TAIL = `cat ./_README.md | sed -e '1,/%CONTAINERS_LIST%/d'` README_TAIL = `cat ./_README.md | sed -e '1,/%CONTAINERS_LIST%/d'`
README_FOOTER = `echo "\n\r_Last update: \`date\`_\n"` README_FOOTER = `echo "\n\r_Last update: \`date\`_\n"`
update_readme: update_readme:
@echo -e "$(README_HEAD) \n\n$(TOOLSET) \n $(README_TAIL) \n$(README_FOOTER)" > README.md @printf "$(README_HEAD) \n\n$(TOOLSET) \n $(README_TAIL) \n$(README_FOOTER)" > README.md
@git add README.md @git add README.md
delete_dangling_images: delete_dangling_images:
......
...@@ -21,11 +21,19 @@ This file is automatically updated after execute `git commit` based on the conte ...@@ -21,11 +21,19 @@ This file is automatically updated after execute `git commit` based on the conte
- its-registry.unl.edu/unl-its/docker-ci/php-lint:7.1 - its-registry.unl.edu/unl-its/docker-ci/php-lint:7.1
- its-registry.unl.edu/unl-its/docker-ci/php-lint:7.2 - its-registry.unl.edu/unl-its/docker-ci/php-lint:7.2
- its-registry.unl.edu/unl-its/docker-ci/php-lint:7.3 - its-registry.unl.edu/unl-its/docker-ci/php-lint:7.3
- its-registry.unl.edu/unl-its/docker-ci/php-lint:7.4
- its-registry.unl.edu/unl-its/docker-ci/php-lint:8.0
- its-registry.unl.edu/unl-its/docker-ci/php-lint:8.1
- its-registry.unl.edu/unl-its/docker-ci/php-lint:8.2
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:5.6 - its-registry.unl.edu/unl-its/docker-ci/php-unit-test:5.6
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.0 - its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.0
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.1 - its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.1
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.2 - its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.2
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.3 - its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.3
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:7.4
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:8.0
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:8.1
- its-registry.unl.edu/unl-its/docker-ci/php-unit-test:8.2
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:android - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:android
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:latest - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:latest
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php - its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php
...@@ -33,5 +41,4 @@ This file is automatically updated after execute `git commit` based on the conte ...@@ -33,5 +41,4 @@ This file is automatically updated after execute `git commit` based on the conte
- its-registry.unl.edu/unl-its/docker-ci/xml-lint:latest - its-registry.unl.edu/unl-its/docker-ci/xml-lint:latest
_Last update: Fri Aug 11 12:36:19 AM CDT 2023_
_Last update: Mon Apr 6 14:40:37 CDT 2020_
......
...@@ -10,9 +10,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ...@@ -10,9 +10,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="University of Nebraska - Lincoln" \ org.label-schema.vendor="University of Nebraska - Lincoln" \
org.label-schema.version="0.1.0" \ org.label-schema.version="0.1.0" \
org.label-schema.schema-version="1.0" \ org.label-schema.schema-version="1.0" \
maintainer="J.R. Barreras <rbarrerasmilanes@nebraska.edu>" maintainer="J.R. Barreras <rbarreras@nebraska.edu>"
ENV DEPENDENCY_CHECK_VERSION 6.2.2 ENV DEPENDENCY_CHECK_VERSION 8.3.1
WORKDIR /opt WORKDIR /opt
......
FROM python:3.7-alpine FROM python:3.11-alpine
ARG BUILD_DATE ARG BUILD_DATE
ARG VCS_REF ARG VCS_REF
...@@ -10,7 +10,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \ ...@@ -10,7 +10,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="University of Nebraska - Lincoln" \ org.label-schema.vendor="University of Nebraska - Lincoln" \
org.label-schema.version="0.1.0" \ org.label-schema.version="0.1.0" \
org.label-schema.schema-version="1.0" \ org.label-schema.schema-version="1.0" \
maintainer="J.R. Barreras <barreras@unl.edu>" maintainer="J.R. Barreras <rbarreras@nebraska.edu>"
WORKDIR /work WORKDIR /work
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment