Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define common Ubuntu coredeps Dockerfile #1121

Merged
merged 3 commits into from
Jul 8, 2024
Merged

Define common Ubuntu coredeps Dockerfile #1121

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd587af
Define common Ubuntu coredeps Dockerfile
mthalman Jul 1, 2024
aa3ab2f
Use latest PowerShell version
mthalman Jul 8, 2024
59e4db4
Merge branch 'main' into ubuntu-core-deps
mthalman Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions src/ubuntu/20.04/coredeps/Dockerfile
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions src/ubuntu/22.04/coredeps/Dockerfile → src/ubuntu/common/coredeps/Dockerfile
View file
Open in desktop
mthalman marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM mcr.microsoft.com/powershell:7.2-ubuntu-22.04
ARG POWERSHELL_TAG
FROM mcr.microsoft.com/powershell:$POWERSHELL_TAG

# Install tools used by the VSO build automation.
# Install tools used by the AzDO build automation.
RUN apt-get update \
&& apt-get install -y \
git \
Expand Down
10 changes: 8 additions & 2 deletions src/ubuntu/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{
"platforms": [
{
"dockerfile": "src/ubuntu/20.04/coredeps",
"dockerfile": "src/ubuntu/common/coredeps",
"os": "linux",
"osVersion": "focal",
"tags": {
Expand All @@ -15,6 +15,9 @@
"ubuntu-20.04-coredeps-local": {
"isLocal": true
}
},
"buildArgs": {
"POWERSHELL_TAG": "lts-7.2-ubuntu-20.04"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to define a versions manifest to start putting these types of valuesin? The benefit is to ease maintenance by getting them next to each other. Possibly the value could be decomposed so that the pwsh version is a shared value.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I'm kind of inclined to just change it to a non-version floating tag: lts-ubuntu-20.04. That's essentially the same as installing it via package manager as far what version you end up getting:

dotnet-buildtools-prereqs-docker/src/ubuntu/22.04/debpkg/amd64/Dockerfile

Line 23 in cbf67da

apt-get install -y powershell && \

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the tag usage to get the latest PowerShell version available. This aligns with the version that gets installed by other Dockerfiles that are installing from PMC. This will give you PowerShell 7.4 in both cases.

There is some cleanup of other PowerShell usage amongst the Dockerfiles but that's outside the scope of coredeps so I'll address those separately.

}
}
]
Expand Down Expand Up @@ -202,7 +205,7 @@
{
"platforms": [
{
"dockerfile": "src/ubuntu/22.04/coredeps",
"dockerfile": "src/ubuntu/common/coredeps",
"os": "linux",
"osVersion": "jammy",
"tags": {
Expand All @@ -211,6 +214,9 @@
"ubuntu-22.04-coredeps-local": {
"isLocal": true
}
},
"buildArgs": {
"POWERSHELL_TAG": "lts-7.2-ubuntu-22.04"
}
}
]
Expand Down