remove -onbuild variants

docker-library/official-images#2076
andyli · Jun 14, 2019 · 4c40288 · 4c40288
1 parent 5253ae4
commit 4c40288
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 120 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,11 +18,11 @@ env:
   - VERSION=3.4 VARIANT=alpine3.6
   - VERSION=3.3 VARIANT=alpine3.6
   - VERSION=3.2 VARIANT=alpine3.6
-  - VERSION=4.0 VARIANT=stretch ONBUILD=1
-  - VERSION=3.4 VARIANT=stretch ONBUILD=1
-  - VERSION=3.3 VARIANT=stretch ONBUILD=1
-  - VERSION=3.2 VARIANT=stretch ONBUILD=1
-  - VERSION=3.1 VARIANT=stretch ONBUILD=1
+  - VERSION=4.0 VARIANT=stretch
+  - VERSION=3.4 VARIANT=stretch
+  - VERSION=3.3 VARIANT=stretch
+  - VERSION=3.2 VARIANT=stretch
+  - VERSION=3.1 VARIANT=stretch
   - VERSION=4.0 VARIANT=jessie
   - VERSION=3.4 VARIANT=jessie
   - VERSION=3.3 VARIANT=jessie
@@ -40,7 +40,6 @@ before_script:
 script:
   - docker build -t "$image" "${VARIANT:-.}"
   - ~/official-images/test/run.sh "$image"
-  - if [ -n "$ONBUILD" ]; then docker build -t "${image}-onbuild" onbuild; fi
 
 after_script:
   - docker images

diff --git a/3.1/onbuild/Dockerfile b/3.1/onbuild/Dockerfile
diff --git a/3.2/onbuild/Dockerfile b/3.2/onbuild/Dockerfile
diff --git a/3.3/onbuild/Dockerfile b/3.3/onbuild/Dockerfile
diff --git a/3.4/onbuild/Dockerfile b/3.4/onbuild/Dockerfile
diff --git a/4.0/onbuild/Dockerfile b/4.0/onbuild/Dockerfile
diff --git a/Dockerfile-onbuild.template b/Dockerfile-onbuild.template
diff --git a/Update.hx b/Update.hx
@@ -67,10 +67,6 @@ class Update {
 			"variant": "jessie",
 			"suffix": ["jessie"]
 		},
-		{
-			"variant": "onbuild",
-			"suffix": ["onbuild"]
-		},
 		{
 			"variant": "windowsservercore-ltsc2016",
 			"suffix": ["windowsservercore-ltsc2016", "windowsservercore"]