UNCLASSIFIED

Commit 7131708c authored by Michael Uranaka's avatar Michael Uranaka Committed by Joshua Eason
Browse files

Upgrading to latest gradle image.

parent 9b3d6d02
ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=opensource/gradle/gradle-jre11 ARG BASE_IMAGE=opensource/gradle/gradle-jre11
ARG BASE_TAG=7.0.1 ARG BASE_TAG=7.1
FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
USER 0 USER 0
......
...@@ -8,7 +8,7 @@ code snippets that were submitted from students through the LEARN application. ...@@ -8,7 +8,7 @@ code snippets that were submitted from students through the LEARN application.
## Requirements: ## Requirements:
- Redis CLI - Redis CLI
- Java 11 - Java 11
- Gradle 7.0 - Gradle 7.1
## Container Usage: ## Container Usage:
......
...@@ -8,13 +8,13 @@ name: "galvanize/galvanize/java-code-evaluator" ...@@ -8,13 +8,13 @@ name: "galvanize/galvanize/java-code-evaluator"
# The most specific version should be the first tag and will be shown # The most specific version should be the first tag and will be shown
# on ironbank.dsop.io # on ironbank.dsop.io
tags: tags:
- "0.1.2" - "0.1.3"
- "latest" - "latest"
# Build args passed to Dockerfile ARGs # Build args passed to Dockerfile ARGs
args: args:
BASE_IMAGE: "opensource/gradle/gradle-jre11" BASE_IMAGE: "opensource/gradle/gradle-jre11"
BASE_TAG: "7.0.1" BASE_TAG: "7.1"
# Docker image labels # Docker image labels
labels: labels:
...@@ -23,7 +23,7 @@ labels: ...@@ -23,7 +23,7 @@ labels:
org.opencontainers.image.licenses: "proprietary" org.opencontainers.image.licenses: "proprietary"
org.opencontainers.image.url: "https://www.galvanize.com" org.opencontainers.image.url: "https://www.galvanize.com"
org.opencontainers.image.vendor: "Galvanize" org.opencontainers.image.vendor: "Galvanize"
org.opencontainers.image.version: "0.1.2" org.opencontainers.image.version: "0.1.3"
mil.dso.ironbank.image.keywords: "lms,learn,galvanize,online,classes,remote,learning" mil.dso.ironbank.image.keywords: "lms,learn,galvanize,online,classes,remote,learning"
mil.dso.ironbank.image.type: "commercial" mil.dso.ironbank.image.type: "commercial"
mil.dso.ironbank.product.name: "Learn" mil.dso.ironbank.product.name: "Learn"
...@@ -34,20 +34,20 @@ resources: ...@@ -34,20 +34,20 @@ resources:
type: s3 type: s3
id: galvanize id: galvanize
region: us-gov-west-1 region: us-gov-west-1
url: s3://learn-dependencies/java-evaluator/redis-cli-0.1.2.tar.gz url: s3://learn-dependencies/java-evaluator/redis-cli-0.1.3.tar.gz
filename: redis-cli.tar.gz filename: redis-cli.tar.gz
validation: validation:
type: sha256 type: sha256
value: d1bbce51621f3f77065b9deed213f503fe887c722780ebcadd7d267ce2b5c948 value: 512452740e6c1964c68f2ce2a39f290ec9dd084335a118eddca4a5937fc5c3ca
- auth: - auth:
type: s3 type: s3
id: galvanize id: galvanize
region: us-gov-west-1 region: us-gov-west-1
url: s3://learn-dependencies/java-evaluator/libs-0.1.2.tar.gz url: s3://learn-dependencies/java-evaluator/libs-0.1.3.tar.gz
filename: libs.tar.gz filename: libs.tar.gz
validation: validation:
type: sha256 type: sha256
value: f07a36e8340771879de880752c736138ea64d3166cdb414ed5646473fd3ec1db value: 19836f849044a977bd9481241488f1df1c1626c0c155067cffe0345455258d9d
# List of project maintainers # List of project maintainers
maintainers: maintainers:
......
...@@ -17,8 +17,8 @@ dependencies { ...@@ -17,8 +17,8 @@ dependencies {
} }
tasks.withType(Test).configureEach { tasks.withType(Test).configureEach {
reports.html.enabled = false reports.html.required = false
reports.junitXml.enabled = false reports.junitXml.required = false
} }
test { test {
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
# Image Params. # Image Params.
BASE_REGISTRY=registry1.dso.mil BASE_REGISTRY=registry1.dso.mil
BASE_IMAGE=ironbank/opensource/gradle/gradle-jre11 BASE_IMAGE="ironbank/$(yq e '.args.BASE_IMAGE' ../hardening_manifest.yaml)"
BASE_TAG=7.0.1 BASE_TAG=$(yq e '.args.BASE_TAG' ../hardening_manifest.yaml)
# This is the profile name in your aws credentials file. # This is the profile name in your aws credentials file.
DEPENDENCY_FOLDER=build_dependencies DEPENDENCY_FOLDER=build_dependencies
......
...@@ -30,6 +30,7 @@ while true ; do ...@@ -30,6 +30,7 @@ while true ; do
-x classes \ -x classes \
-x processResources \ -x processResources \
-x processTestResources \ -x processTestResources \
--warning-mode=all \
2>&1 | tee results.txt 2>&1 | tee results.txt
java -jar send_results/build/libs/send-results.jar java -jar send_results/build/libs/send-results.jar
......
Markdown is supported
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