From 610ec913a61041e1e2ec6626d24b7d8740a6a5b7 Mon Sep 17 00:00:00 2001
From: Raul Barreras <rbarreras@nebraska.edu>
Date: Fri, 11 Aug 2023 09:10:31 -0500
Subject: [PATCH] bump dependency-check version
---
Makefile | 4 ++--
README.md | 10 +++++++++-
dependency-check/Dockerfile | 4 ++--
detect-secrets/Dockerfile | 4 ++--
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 69a643d..7083d5a 100644
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,7 @@ xml-lint: xml-lint/Dockerfile
# Utility Images
####################
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
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'`
README_TAIL = `cat ./_README.md | sed -e '1,/%CONTAINERS_LIST%/d'`
README_FOOTER = `echo "\n\r_Last update: \`date\`_\n"`
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
delete_dangling_images:
diff --git a/README.md b/README.md
index 5f67492..a31e61b 100644
--- a/README.md
+++ b/README.md
@@ -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.2
- 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: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.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.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:latest
- its-registry.unl.edu/unl-its/docker-ci/static-code-analysis:php
@@ -33,4 +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
-
_Last update: Mon Apr 6 14:40:37 CDT 2020_
+
_Last update: Fri Aug 11 12:36:19 AM CDT 2023_
\ No newline at end of file
diff --git a/dependency-check/Dockerfile b/dependency-check/Dockerfile
index ce12781..9f42516 100644
--- a/dependency-check/Dockerfile
+++ b/dependency-check/Dockerfile
@@ -10,9 +10,9 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="University of Nebraska - Lincoln" \
org.label-schema.version="0.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
diff --git a/detect-secrets/Dockerfile b/detect-secrets/Dockerfile
index 390f8c3..1ffa7cc 100644
--- a/detect-secrets/Dockerfile
+++ b/detect-secrets/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-alpine
+FROM python:3.11-alpine
ARG BUILD_DATE
ARG VCS_REF
@@ -10,7 +10,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="University of Nebraska - Lincoln" \
org.label-schema.version="0.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
--
GitLab