Skip to content

Commit

Permalink
Remove EOL Fedora 29 and Ubuntu 14.04 Dockerfiles (#216)
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelSimons authored Dec 16, 2019
1 parent ce6fe8f commit 5455fd5
Show file tree
Hide file tree
Showing 12 changed files with 7 additions and 348 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,22 @@ There will be a need for modifying existing Dockerfiles or creating new ones. F

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.

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

```powershell
.\build.ps1 -DockerfilePath "fedora/24"
.\build.ps1 -DockerfilePath "*fedora/30/amd64*"
```
It is a good practice to use `--dry-run` option on the first attempt to verify what commands will get run.
```powershell
.\build.ps1 -DockerfilePath "fedora/24" -ImageBuilderCustomArgs "--dry-run"
.\build.ps1 -DockerfilePath "*fedora/30/amd64*" -ImageBuilderCustomArgs "--dry-run"
```
Partial paths and wildcards in the `-DockerfilePath` option are also supported. The following example will build all the Fedora Dockerfiles.
```powershell
.\build.ps1 -DockerfilePath "fedora/*"
.\build.ps1 -DockerfilePath "*fedora/*"
```
3. Prepare a PR
Expand All @@ -54,7 +54,7 @@ There will be a need for modifying existing Dockerfiles or creating new ones. F
### Source Folder Structure
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.
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.
### Manifest
Expand All @@ -64,10 +64,10 @@ The [manifest.json](./manifest.json) contains metadata used by the build infrast
{
"platforms": [
{
"dockerfile": "alpine/3.6/amd64",
"dockerfile": "alpine/3.9/amd64",
"os": "linux",
"tags": {
"alpine-3.6-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
"alpine-3.9-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
}
}
]
Expand Down
19 changes: 0 additions & 19 deletions eng/pipelines/dotnet-buildtools-prereqs-ubuntu14.yml

This file was deleted.

96 changes: 0 additions & 96 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,102 +207,6 @@
}
}]
},
{
"platforms": [
{
"dockerfile": "src/fedora/29",
"os": "linux",
"osVersion": "fedora29",
"tags": {
"fedora-29-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
"fedora-29": {
"isLocal": true
}
}
}
]
},
{
"platforms": [
{
"dockerfile": "src/fedora/29/helix/amd64",
"os": "linux",
"osVersion": "fedora29",
"tags": {
"fedora-29-helix-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
}
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/14.04",
"os": "linux",
"osVersion": "ubuntu14.04",
"tags": {
"ubuntu-14.04-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
"ubuntu-14.04": {
"isLocal": true
}
}
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/14.04/debpkg",
"os": "linux",
"osVersion": "ubuntu14.04",
"tags": {
"ubuntu-14.04-debpkg-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
}
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/14.04/coredeps",
"os": "linux",
"osVersion": "ubuntu14.04",
"tags": {
"ubuntu-14.04-coredeps-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
"ubuntu-14.04-coredeps": {
"isLocal": true
}
}
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/14.04/crossdeps",
"os": "linux",
"osVersion": "ubuntu14.04",
"tags": {
"ubuntu-14.04-crossdeps-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {},
"ubuntu-14.04-crossdeps": {
"isLocal": true
}
}
}
]
},
{
"platforms": [
{
"dockerfile": "src/ubuntu/14.04/cross",
"os": "linux",
"osVersion": "ubuntu14.04",
"tags": {
"ubuntu-14.04-cross-$(System:DockerfileGitCommitSha)-$(System:TimeStamp)": {}
}
}
]
},
{
"platforms": [
{
Expand Down
45 changes: 0 additions & 45 deletions src/fedora/29/Dockerfile

This file was deleted.

40 changes: 0 additions & 40 deletions src/fedora/29/helix/amd64/Dockerfile

This file was deleted.

48 changes: 0 additions & 48 deletions src/ubuntu/14.04/Dockerfile

This file was deleted.

31 changes: 0 additions & 31 deletions src/ubuntu/14.04/coredeps/Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions src/ubuntu/14.04/cross/Dockerfile

This file was deleted.

3 changes: 0 additions & 3 deletions src/ubuntu/14.04/cross/hooks/post-build

This file was deleted.

3 changes: 0 additions & 3 deletions src/ubuntu/14.04/cross/hooks/pre-build

This file was deleted.

37 changes: 0 additions & 37 deletions src/ubuntu/14.04/crossdeps/Dockerfile

This file was deleted.

Loading

0 comments on commit 5455fd5

Please sign in to comment.