Skip to content

Use azure linux for Image Builder container image #1393

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

Merged
lbussell merged 5 commits into from
Aug 15, 2024
Merged

Use azure linux for Image Builder container image #1393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d910acf
Use azure linux for Image Builder container image
ellahathaway Aug 13, 2024
a77e44b
Merge branch 'main' into mariner-container-image
ellahathaway Aug 14, 2024
ccaa544
Use images from main
ellahathaway Aug 14, 2024
b09ee8e
PR feedback
ellahathaway Aug 14, 2024
6dec8ee
Merge branch 'main' into mariner-container-image
lbussell Aug 15, 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
19 changes: 11 additions & 8 deletions src/Microsoft.DotNet.ImageBuilder/Dockerfile.linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
# docker run --rm -v /var/run/docker.sock:/var/run/docker.sock -v <local path to build>:/repo -w /repo image-builder <image-build args>

# build Microsoft.DotNet.ImageBuilder
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build-env
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0-azurelinux3.0 AS build-env
ARG TARGETARCH

# download oras package tarball
WORKDIR /
RUN oras_version=1.2.0 \
&& wget https://github.com/oras-project/oras/releases/download/v${oras_version}/oras_${oras_version}_linux_${TARGETARCH}.tar.gz -O oras_linux.tar.gz \
&& curl -fSL --output oras_linux.tar.gz https://github.com/oras-project/oras/releases/download/v${oras_version}/oras_${oras_version}_linux_${TARGETARCH}.tar.gz \
&& mkdir -p oras-install/ \
&& tar -zxf oras_linux.tar.gz -C oras-install/ \
&& rm -rf oras_linux.tar.gz
Expand All @@ -19,20 +19,23 @@ WORKDIR /image-builder
# restore packages before copying entire source - provides optimizations when rebuilding
COPY NuGet.config ./
COPY src/Microsoft.DotNet.ImageBuilder.csproj ./src/
RUN dotnet restore -r linux-musl-$TARGETARCH ./src/Microsoft.DotNet.ImageBuilder.csproj
RUN dotnet restore -r linux-$TARGETARCH ./src/Microsoft.DotNet.ImageBuilder.csproj

# copy everything else and publish
COPY . ./
RUN dotnet publish -r linux-musl-$TARGETARCH ./src/Microsoft.DotNet.ImageBuilder.csproj --self-contained=true --no-restore -o out
RUN dotnet publish -r linux-$TARGETARCH ./src/Microsoft.DotNet.ImageBuilder.csproj --self-contained=true --no-restore -o out


# build runtime image
FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-alpine
FROM mcr.microsoft.com/dotnet/runtime-deps:8.0-azurelinux3.0

# install tooling
RUN apk add --no-cache \
docker \
git
RUN tdnf install -y \
moby-engine \
docker-cli \
docker-buildx \
git \
&& tdnf clean all

# install oras tool
COPY --from=build-env ["/oras-install/oras", "/usr/local/bin"]
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.ImageBuilder/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"dockerfile": "Dockerfile.linux",
"os": "linux",
"osVersion": "alpine",
"osVersion": "azurelinux",
"tags": {
"linux-amd64": {},
"linux-amd64-$(UniqueId)": {}
Expand All @@ -24,7 +24,7 @@
"architecture": "arm64",
"dockerfile": "Dockerfile.linux",
"os": "linux",
"osVersion": "alpine",
"osVersion": "azurelinux",
"tags": {
"linux-arm64": {},
"linux-arm64-$(UniqueId)": {}
Expand Down