Skip to content

Commit ced31b6

Browse files
William Linguerrera
authored andcommitted
Update dockers (#5186) (#5416)
- Remove ubuntu 14.04 and groovey file - Remove all old fedora - Update to Debian Stretch - Remove rhel.6 - No debian 9 1.x runtime support
1 parent 754b385 commit ced31b6

File tree

14 files changed

+22
-412
lines changed

14 files changed

+22
-412
lines changed

.vsts-ci.yml

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,6 @@ stages:
8888
strategy:
8989
matrix:
9090
${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
91-
Build_Ubuntu_14_04_Release_x64:
92-
_BuildConfig: Release
93-
_DockerParameter: '--docker ubuntu.14.04'
94-
_LinuxPortable: ''
95-
_RuntimeIdentifier: ''
96-
_BuildArchitecture: 'x64'
97-
_DropSuffix: ''
9891
Build_Ubuntu_16_04_Debug_x64:
9992
_BuildConfig: Debug
10093
_DockerParameter: '--docker ubuntu.16.04'
@@ -109,20 +102,6 @@ stages:
109102
_RuntimeIdentifier: ''
110103
_BuildArchitecture: 'x64'
111104
_DropSuffix: ''
112-
Build_Fedora_27_Debug_x64:
113-
_BuildConfig: Debug
114-
_DockerParameter: '--docker fedora.27'
115-
_LinuxPortable: '--linux-portable'
116-
_RuntimeIdentifier: ''
117-
_BuildArchitecture: 'x64'
118-
_DropSuffix: ''
119-
Build_Fedora_28_Debug_x64:
120-
_BuildConfig: Debug
121-
_DockerParameter: '--docker fedora.28'
122-
_LinuxPortable: '--linux-portable'
123-
_RuntimeIdentifier: ''
124-
_BuildArchitecture: 'x64'
125-
_DropSuffix: ''
126105
Build_Fedora_29_Debug_x64:
127106
_BuildConfig: Debug
128107
_DockerParameter: '--docker fedora.29'
@@ -137,7 +116,7 @@ stages:
137116
_RuntimeIdentifier: ''
138117
_BuildArchitecture: 'x64'
139118
_DropSuffix: ''
140-
Build_Debian_Jessie_Debug_x64:
119+
Build_Debian_Stretch_Debug_x64:
141120
_BuildConfig: Debug
142121
_DockerParameter: '--docker debian'
143122
_LinuxPortable: ''
@@ -151,13 +130,6 @@ stages:
151130
_RuntimeIdentifier: ''
152131
_BuildArchitecture: 'x64'
153132
_DropSuffix: ''
154-
Build_Rhel_6_Debug_x64:
155-
_BuildConfig: Debug
156-
_DockerParameter: '--docker rhel.6'
157-
_LinuxPortable: ''
158-
_RuntimeIdentifier: '--runtime-id rhel.6-x64'
159-
_BuildArchitecture: 'x64'
160-
_DropSuffix: ''
161133
Build_Arm_Debug:
162134
_BuildConfig: Debug
163135
_DockerParameter: ''
@@ -208,13 +180,6 @@ stages:
208180
_RuntimeIdentifier: '--runtime-id linux-arm64'
209181
_BuildArchitecture: 'arm64'
210182
_DropSuffix: ''
211-
Build_Rhel_6_Release_x64:
212-
_BuildConfig: Release
213-
_DockerParameter: '--docker rhel.6'
214-
_LinuxPortable: ''
215-
_RuntimeIdentifier: '--runtime-id rhel.6-x64'
216-
_BuildArchitecture: 'x64'
217-
_DropSuffix: ''
218183
Build_Linux_musl_Release_x64:
219184
_BuildConfig: Release
220185
_DockerParameter: '--docker alpine.3.6'

eng/docker/debian/Dockerfile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,21 @@
44
#
55

66
# Dockerfile that creates a container suitable to build dotnet-cli
7-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-jessie-debpkg-58e4974-20190328133153
7+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-d61254f-20190807161114
8+
9+
# Install the deb packaging toolchain we need to build debs
10+
RUN apt-get update \
11+
&& apt-get -y install \
12+
debhelper \
13+
build-essential \
14+
devscripts \
15+
locales \
16+
&& rm -rf /var/lib/apt/lists/*
17+
18+
# liblldb is needed so deb package build does not throw missing library info errors
19+
RUN apt-get update \
20+
&& apt-get -y install liblldb-3.9 \
21+
&& rm -rf /var/lib/apt/lists/*
822

923
# Misc Dependencies for build
1024
RUN rm -rf /var/lib/apt/lists/* && \
@@ -13,6 +27,8 @@ RUN rm -rf /var/lib/apt/lists/* && \
1327
sudo && \
1428
apt-get clean && \
1529
rm -rf /var/lib/apt/lists/*
30+
31+
RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8
1632

1733
# Setup User to match Host User, and give superuser permissions
1834
ARG USER_ID=0

eng/docker/fedora.23/Dockerfile

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

eng/docker/fedora.24/Dockerfile

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

eng/docker/fedora.27/Dockerfile

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

eng/docker/fedora.28/Dockerfile

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

eng/docker/rhel.6/Dockerfile

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

eng/docker/ubuntu.14.04/Dockerfile

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

0 commit comments

Comments
 (0)