Use slim images for Deb9 (#224)

RDIL · TravisEz13 · commit 441d0b69c912 · 2019-05-03T10:23:03.000-07:00
diff --git a/release/preview/centos7/meta.json b/release/preview/centos7/meta.json
@@ -9,6 +9,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 475
+        "size": 501
     }
 }
diff --git a/release/preview/centos7/test-deps/meta.json b/release/preview/centos7/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 497
+        "size": 530
     }
 }
diff --git a/release/preview/debian9/docker/Dockerfile b/release/preview/debian9/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=stretch
+ARG fromTag=stretch-slim
 ARG imageRepo=debian
 
-
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.0-preview.3
diff --git a/release/preview/debian9/getLatestTag.ps1 b/release/preview/debian9/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the debian image on Docker
 
 # The versions of debian we care about
-$shortTags = @('stretch')
+$shortTags = @('stretch-slim')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?' -AlternativeShortTag '9'
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9'
diff --git a/release/stable/centos7/meta.json b/release/stable/centos7/meta.json
@@ -9,6 +9,6 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 475
+        "size": 500
     }
 }
diff --git a/release/stable/centos7/test-deps/meta.json b/release/stable/centos7/test-deps/meta.json
@@ -10,6 +10,6 @@
         "test-deps"
     ],
     "TestProperties": {
-        "size": 497
+        "size": 530
     }
 }
diff --git a/release/stable/debian9/docker/Dockerfile b/release/stable/debian9/docker/Dockerfile
@@ -1,8 +1,7 @@
 # Docker image file that describes an Debian 9 image with PowerShell installed from Microsoft APT Repo
-ARG fromTag=stretch
+ARG fromTag=stretch-slim
 ARG imageRepo=debian
 
-
 FROM ${imageRepo}:${fromTag} AS installer-env
 
 ARG PS_VERSION=6.2.0
diff --git a/release/stable/debian9/getLatestTag.ps1 b/release/stable/debian9/getLatestTag.ps1
@@ -4,11 +4,11 @@
 # return objects representing the tags we need to base the debian image on Docker
 
 # The versions of debian we care about
-$shortTags = @('stretch')
+$shortTags = @('stretch-slim')
 
 $parent = Join-Path -Path $PSScriptRoot -ChildPath '..'
 $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..'
 $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags'
 Import-Module $modulePath
 
-Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?' -AlternativeShortTag '9'
+Get-DockerTags -ShortTags $shortTags -Image "debian" -FullTagFilter 'stretch-\d{8}[\.\d{1}]?-slim' -AlternativeShortTag '9'

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@`
`9`	`9`	`],`
`10`	`10`	`"SubImage": "test-deps",`
`11`	`11`	`"TestProperties": {`
`12`		`- "size": 475`
	`12`	`+ "size": 501`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,6 @@`
`10`	`10`	`"test-deps"`
`11`	`11`	`],`
`12`	`12`	`"TestProperties": {`
`13`		`- "size": 497`
	`13`	`+ "size": 530`
`14`	`14`	`}`
`15`	`15`	`}`