diff --git a/Dockerfile b/Dockerfile index f687beda661f9530f2c89f84677aceecbc6a99b5..7b80f6566599673bd8e0714f5186d40d5ac4778a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_REGISTRY=registry1.dso.mil 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} USER 0 diff --git a/README.md b/README.md index 70982a2e9f6615d5a03a84a9697c7c89f8bbf6de..5f7e4abc14ab7121fe279178ae5f8fe172d2c838 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ code snippets that were submitted from students through the LEARN application. ## Requirements: - Redis CLI - Java 11 -- Gradle 7.0 +- Gradle 7.1 ## Container Usage: diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index e93e837d519fa3ae7c21d397483d06f0c04534e9..92aabe3cf48e0c837bab2e484f5b7d7631cd0fab 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -8,13 +8,13 @@ name: "galvanize/galvanize/java-code-evaluator" # The most specific version should be the first tag and will be shown # on ironbank.dsop.io tags: -- "0.1.2" +- "0.1.3" - "latest" # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "opensource/gradle/gradle-jre11" - BASE_TAG: "7.0.1" + BASE_TAG: "7.1" # Docker image labels labels: @@ -23,7 +23,7 @@ labels: org.opencontainers.image.licenses: "proprietary" org.opencontainers.image.url: "https://www.galvanize.com" 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.type: "commercial" mil.dso.ironbank.product.name: "Learn" @@ -34,20 +34,20 @@ resources: type: s3 id: galvanize 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 validation: type: sha256 - value: d1bbce51621f3f77065b9deed213f503fe887c722780ebcadd7d267ce2b5c948 + value: 512452740e6c1964c68f2ce2a39f290ec9dd084335a118eddca4a5937fc5c3ca - auth: type: s3 id: galvanize 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 validation: type: sha256 - value: f07a36e8340771879de880752c736138ea64d3166cdb414ed5646473fd3ec1db + value: 19836f849044a977bd9481241488f1df1c1626c0c155067cffe0345455258d9d # List of project maintainers maintainers: diff --git a/scripts/build.gradle b/scripts/build.gradle index e80b5f1b2a9204e1fe6d5766b024bab48733697f..79d8fe677167654040cf26de7d81895702dc291a 100755 --- a/scripts/build.gradle +++ b/scripts/build.gradle @@ -17,8 +17,8 @@ dependencies { } tasks.withType(Test).configureEach { - reports.html.enabled = false - reports.junitXml.enabled = false + reports.html.required = false + reports.junitXml.required = false } test { diff --git a/scripts/repackage.sh b/scripts/repackage.sh index 97e7e7111456050c11b0639f790adee77c2fba72..5620d6ecc7689f5ac9c875af1a280145304390fd 100755 --- a/scripts/repackage.sh +++ b/scripts/repackage.sh @@ -2,8 +2,8 @@ # Image Params. BASE_REGISTRY=registry1.dso.mil -BASE_IMAGE=ironbank/opensource/gradle/gradle-jre11 -BASE_TAG=7.0.1 +BASE_IMAGE="ironbank/$(yq e '.args.BASE_IMAGE' ../hardening_manifest.yaml)" +BASE_TAG=$(yq e '.args.BASE_TAG' ../hardening_manifest.yaml) # This is the profile name in your aws credentials file. DEPENDENCY_FOLDER=build_dependencies diff --git a/scripts/run-local-loop.sh b/scripts/run-local-loop.sh index 7546602b4e0987f2416b1dd14a7ad076afa10c5e..3dfc268d66e9eea7654df53436feae948811face 100755 --- a/scripts/run-local-loop.sh +++ b/scripts/run-local-loop.sh @@ -30,6 +30,7 @@ while true ; do -x classes \ -x processResources \ -x processTestResources \ + --warning-mode=all \ 2>&1 | tee results.txt java -jar send_results/build/libs/send-results.jar