Skip to content

Commit 5455fd5

Browse files
Remove EOL Fedora 29 and Ubuntu 14.04 Dockerfiles (dotnet#216)
1 parent ce6fe8f commit 5455fd5

File tree

12 files changed

+7
-348
lines changed

12 files changed

+7
-348
lines changed

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ There will be a need for modifying existing Dockerfiles or creating new ones. F
3030

3131
2. Validate the changes locally by running [build.ps1](./build.ps1). It is strongly suggested to specify the `-DockerfilePath` option to avoid the overhead of building all the images.
3232

33-
For example, if editing the [Fedora 24 Dockerfile](./src/fedora/24/Dockerfile), then run the following command to build just that Dockerfile.
33+
For example, if editing the [Fedora 30 Dockerfile](./src/fedora/30/amd64/Dockerfile), then run the following command to build just that Dockerfile.
3434

3535
```powershell
36-
.\build.ps1 -DockerfilePath "fedora/24"
36+
.\build.ps1 -DockerfilePath "*fedora/30/amd64*"
3737
```
3838
3939
It is a good practice to use `--dry-run` option on the first attempt to verify what commands will get run.
4040
4141
```powershell
42-
.\build.ps1 -DockerfilePath "fedora/24" -ImageBuilderCustomArgs "--dry-run"
42+
.\build.ps1 -DockerfilePath "*fedora/30/amd64*" -ImageBuilderCustomArgs "--dry-run"
4343
```
4444
4545
Partial paths and wildcards in the `-DockerfilePath` option are also supported. The following example will build all the Fedora Dockerfiles.
4646
4747
```powershell
48-
.\build.ps1 -DockerfilePath "fedora/*"
48+
.\build.ps1 -DockerfilePath "*fedora/*"
4949
```
5050
5151
3. Prepare a PR
@@ -54,7 +54,7 @@ There will be a need for modifying existing Dockerfiles or creating new ones. F
5454
5555
### Source Folder Structure
5656
57-
The folder structure used in [src](./src) aligns with the tagging convention - `<linux-distribution-name>-<version>-<variant>-<architecture>`. For example, the Dockerfile used to produce the `mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-1fc8e66-20181220200247` image is stored in the [src/alpine/3.6/amd64](./src/alpine/3.6/amd64) folder.
57+
The folder structure used in [src](./src) aligns with the tagging convention - `<linux-distribution-name>-<version>-<variant>-<architecture>`. For example, the Dockerfile used to produce the `mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.9-50f0d02-20191210224540` image is stored in the [src/alpine/3.9/amd64](./src/alpine/3.9/amd64) folder.
5858
5959
### Manifest
6060
@@ -64,10 +64,10 @@ The [manifest.json](./manifest.json) contains metadata used by the build infrast
6464
{
6565
"platforms": [
6666
{
67-
"dockerfile": "alpine/3.6/amd64",
67+
"dockerfile": "alpine/3.9/amd64",
6868
"os": "linux",
6969
"tags": {
70-
"alpine-3.6-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
70+
"alpine-3.9-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
7171
}
7272
}
7373
]

eng/pipelines/dotnet-buildtools-prereqs-ubuntu14.yml

-19
This file was deleted.

manifest.json

-96
Original file line numberDiff line numberDiff line change
@@ -207,102 +207,6 @@
207207
}
208208
}]
209209
},
210-
{
211-
"platforms": [
212-
{
213-
"dockerfile": "src/fedora/29",
214-
"os": "linux",
215-
"osVersion": "fedora29",
216-
"tags": {
217-
"fedora-29-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
218-
"fedora-29": {
219-
"isLocal": true
220-
}
221-
}
222-
}
223-
]
224-
},
225-
{
226-
"platforms": [
227-
{
228-
"dockerfile": "src/fedora/29/helix/amd64",
229-
"os": "linux",
230-
"osVersion": "fedora29",
231-
"tags": {
232-
"fedora-29-helix-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
233-
}
234-
}
235-
]
236-
},
237-
{
238-
"platforms": [
239-
{
240-
"dockerfile": "src/ubuntu/14.04",
241-
"os": "linux",
242-
"osVersion": "ubuntu14.04",
243-
"tags": {
244-
"ubuntu-14.04-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
245-
"ubuntu-14.04": {
246-
"isLocal": true
247-
}
248-
}
249-
}
250-
]
251-
},
252-
{
253-
"platforms": [
254-
{
255-
"dockerfile": "src/ubuntu/14.04/debpkg",
256-
"os": "linux",
257-
"osVersion": "ubuntu14.04",
258-
"tags": {
259-
"ubuntu-14.04-debpkg-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
260-
}
261-
}
262-
]
263-
},
264-
{
265-
"platforms": [
266-
{
267-
"dockerfile": "src/ubuntu/14.04/coredeps",
268-
"os": "linux",
269-
"osVersion": "ubuntu14.04",
270-
"tags": {
271-
"ubuntu-14.04-coredeps-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
272-
"ubuntu-14.04-coredeps": {
273-
"isLocal": true
274-
}
275-
}
276-
}
277-
]
278-
},
279-
{
280-
"platforms": [
281-
{
282-
"dockerfile": "src/ubuntu/14.04/crossdeps",
283-
"os": "linux",
284-
"osVersion": "ubuntu14.04",
285-
"tags": {
286-
"ubuntu-14.04-crossdeps-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
287-
"ubuntu-14.04-crossdeps": {
288-
"isLocal": true
289-
}
290-
}
291-
}
292-
]
293-
},
294-
{
295-
"platforms": [
296-
{
297-
"dockerfile": "src/ubuntu/14.04/cross",
298-
"os": "linux",
299-
"osVersion": "ubuntu14.04",
300-
"tags": {
301-
"ubuntu-14.04-cross-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
302-
}
303-
}
304-
]
305-
},
306210
{
307211
"platforms": [
308212
{

src/fedora/29/Dockerfile

-45
This file was deleted.

src/fedora/29/helix/amd64/Dockerfile

-40
This file was deleted.

src/ubuntu/14.04/Dockerfile

-48
This file was deleted.

src/ubuntu/14.04/coredeps/Dockerfile

-31
This file was deleted.

src/ubuntu/14.04/cross/Dockerfile

-4
This file was deleted.

src/ubuntu/14.04/cross/hooks/post-build

-3
This file was deleted.

src/ubuntu/14.04/cross/hooks/pre-build

-3
This file was deleted.

src/ubuntu/14.04/crossdeps/Dockerfile

-37
This file was deleted.

0 commit comments

Comments
 (0)