From 8b6c48239767102cf1bf6425328f504e5601c19b Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Wed, 2 Dec 2020 12:33:04 -0800
Subject: [PATCH] Fix "latest" references

---
 containers/alpine/definition-manifest.json | 1 +
 containers/cpp/definition-manifest.json    | 3 ++-
 containers/dotnet/definition-manifest.json | 2 +-
 containers/go/definition-manifest.json     | 2 +-
 containers/java-8/definition-manifest.json | 4 ++--
 containers/java/definition-manifest.json   | 2 +-
 containers/php/definition-manifest.json    | 2 +-
 containers/ruby/definition-manifest.json   | 2 +-
 containers/rust/definition-manifest.json   | 2 +-
 containers/ubuntu/definition-manifest.json | 1 +
 10 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/containers/alpine/definition-manifest.json b/containers/alpine/definition-manifest.json
index 021df61a..2a69538b 100644
--- a/containers/alpine/definition-manifest.json
+++ b/containers/alpine/definition-manifest.json
@@ -1,6 +1,7 @@
 {
 	"variants": ["3.12", "3.11", "3.10"],
 	"build": {
+		"latest": false,
 		"rootDistro": "alpine",
 		"tags": [
 			"base:${VERSION}-alpine-${VARIANT}",
diff --git a/containers/cpp/definition-manifest.json b/containers/cpp/definition-manifest.json
index 33f26096..c95ba309 100644
--- a/containers/cpp/definition-manifest.json
+++ b/containers/cpp/definition-manifest.json
@@ -16,7 +16,8 @@
 			"buster": [
 				"cpp:${VERSION}-debian-10",
 				"cpp:${VERSION}-debian10",
-				"cpp:${VERSION}-debian"
+				"cpp:${VERSION}-debian",
+				"cpp:${VERSION}"
 			],
 			"stretch": [
 				"cpp:${VERSION}-debian9",
diff --git a/containers/dotnet/definition-manifest.json b/containers/dotnet/definition-manifest.json
index c21bca80..4b1f4829 100644
--- a/containers/dotnet/definition-manifest.json
+++ b/containers/dotnet/definition-manifest.json
@@ -1,7 +1,7 @@
 {
 	"variants": ["5.0", "3.1", "2.1"],
 	"build": {
-		"latest": "true",
+		"latest": true,
 		"rootDistro": "debian",
 		"tags": [
 			"dotnetcore:${VERSION}-${VARIANT}",
diff --git a/containers/go/definition-manifest.json b/containers/go/definition-manifest.json
index 7da20cc6..b755dca2 100644
--- a/containers/go/definition-manifest.json
+++ b/containers/go/definition-manifest.json
@@ -1,7 +1,7 @@
 {
 	"variants": ["1", "1.15", "1.14"],
 	"build": {
-		"latest": "true",
+		"latest": true,
 		"rootDistro": "debian",
 		"tags": [
 			"go:${VERSION}-${VARIANT}"
diff --git a/containers/java-8/definition-manifest.json b/containers/java-8/definition-manifest.json
index f89bb63b..08770695 100644
--- a/containers/java-8/definition-manifest.json
+++ b/containers/java-8/definition-manifest.json
@@ -1,6 +1,6 @@
 {
 	"build": {
-		"latest": "false",
+		"latest": false,
 		"rootDistro": "debian",
 		"parent": "java",
 		"tags": [
@@ -8,7 +8,7 @@
 		]
 	},
 	"dependencies": {
-		"image": "openjdk:11-jdk-buster",
+		"image": "openjdk:8-jdk-buster",
 		"imageLink": "https://hub.docker.com/_/java",
 		"debian": [
 			"apt-utils",
diff --git a/containers/java/definition-manifest.json b/containers/java/definition-manifest.json
index cd8ce089..b324096a 100644
--- a/containers/java/definition-manifest.json
+++ b/containers/java/definition-manifest.json
@@ -1,7 +1,7 @@
 {
 	"variants": [ "15", "11" ],
 	"build": {
-		"latest": "true",
+		"latest": true,
 		"rootDistro": "debian",
 		"tags": [
 			"java:${VERSION}-${VARIANT}"
diff --git a/containers/php/definition-manifest.json b/containers/php/definition-manifest.json
index e9afcca2..05f7974e 100644
--- a/containers/php/definition-manifest.json
+++ b/containers/php/definition-manifest.json
@@ -1,7 +1,7 @@
 {
 	"variants": ["7", "7.4", "7.3"],
 	"build": {
-		"latest": "true",
+		"latest": true,
 		"rootDistro": "debian",
 		"tags": [
 			"php:${VERSION}-${VARIANT}"
diff --git a/containers/ruby/definition-manifest.json b/containers/ruby/definition-manifest.json
index 53de1101..cdd9ac7a 100644
--- a/containers/ruby/definition-manifest.json
+++ b/containers/ruby/definition-manifest.json
@@ -1,7 +1,7 @@
 {
 	"variants": ["2", "2.7", "2.6", "2.5"],
 	"build": {
-		"latest": "true",
+		"latest": true,
 		"rootDistro": "debian",
 		"tags": [
 			"ruby:${VERSION}-${VARIANT}"
diff --git a/containers/rust/definition-manifest.json b/containers/rust/definition-manifest.json
index dfaf8b9e..cc049d89 100644
--- a/containers/rust/definition-manifest.json
+++ b/containers/rust/definition-manifest.json
@@ -1,6 +1,6 @@
 {
 	"build": {
-		"latest": "true",
+		"latest": true,
 		"rootDistro": "debian",
 		"tags": [
 			"rust:${VERSION}-1",
diff --git a/containers/ubuntu/definition-manifest.json b/containers/ubuntu/definition-manifest.json
index 0026a087..66c392a3 100644
--- a/containers/ubuntu/definition-manifest.json
+++ b/containers/ubuntu/definition-manifest.json
@@ -1,6 +1,7 @@
 {
 	"variants": ["focal", "bionic"],
 	"build": {
+		"latest": false,
 		"rootDistro": "debian",
 		"tags": [
 			"base:${VERSION}-${VARIANT}"