Skip to content

Commit c4e34da

Browse files
committed
1 parent c4125e0 commit c4e34da

File tree

7 files changed

+4
-201
lines changed

7 files changed

+4
-201
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@ services: docker
33

44
matrix:
55
include:
6-
- os: windows
7-
dist: 1803-containers
8-
env: VERSION=1.13 VARIANT=windows/windowsservercore-1803
96
- os: linux
107
env: VERSION=1.13 VARIANT=buster
118
- os: linux
129
env: VERSION=1.13 VARIANT=stretch
1310
- os: linux
1411
env: VERSION=1.13 VARIANT=alpine3.10
15-
- os: windows
16-
dist: 1803-containers
17-
env: VERSION=1.12 VARIANT=windows/windowsservercore-1803
1812
- os: linux
1913
env: VERSION=1.12 VARIANT=buster
2014
- os: linux

1.12/windows/nanoserver-1803/Dockerfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

1.12/windows/windowsservercore-1803/Dockerfile

Lines changed: 0 additions & 73 deletions
This file was deleted.

1.13/windows/nanoserver-1803/Dockerfile

Lines changed: 0 additions & 22 deletions
This file was deleted.

1.13/windows/windowsservercore-1803/Dockerfile

Lines changed: 0 additions & 73 deletions
This file was deleted.

generate-stackbrew-library.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ for version in "${versions[@]}"; do
7878

7979
for v in \
8080
buster stretch alpine{3.10,3.9} \
81-
windows/windowsservercore-{ltsc2016,1803,1809} \
82-
windows/nanoserver-{1803,1809} \
81+
windows/windowsservercore-{ltsc2016,1809} \
82+
windows/nanoserver-1809 \
8383
; do
8484
dir="$version/$v"
8585

update.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ for version in "${versions[@]}"; do
106106
done
107107

108108
for winVariant in \
109-
nanoserver-{1803,1809} \
110-
windowsservercore-{ltsc2016,1803,1809} \
109+
nanoserver-1809 \
110+
windowsservercore-{ltsc2016,1809} \
111111
; do
112112
if [ -d "$version/windows/$winVariant" ]; then
113113
sed -r \
@@ -118,7 +118,6 @@ for version in "${versions[@]}"; do
118118

119119
case "$winVariant" in
120120
nanoserver-*) ;; # nanoserver images COPY --from=...:...-windowsservercore-...
121-
*-1803) travisEnv='\n - os: windows\n dist: 1803-containers\n env: VERSION='"$version VARIANT=windows/$winVariant$travisEnv" ;;
122121
*-1809) ;; # no AppVeyor or Travis support for 1809: https://github.com/appveyor/ci/issues/1885 and https://github.com/appveyor/ci/issues/2676
123122
*) appveyorEnv='\n - version: '"$version"'\n variant: '"$winVariant$appveyorEnv" ;;
124123
esac

0 commit comments

Comments
 (0)