Skip to content

Define Alpine helix images using multi-platform dockerfiles #1147

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
MichaelSimons merged 3 commits into from
Jul 25, 2024
Merged

Define Alpine helix images using multi-platform dockerfiles #1147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7d685d
Define Alpine helix images using multi-platform dockerfiles
jkoritzinsky Jul 24, 2024
1711f8c
Add library repo name
jkoritzinsky Jul 24, 2024
3abeaf2
Fix dependencies
jkoritzinsky Jul 24, 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
16 changes: 8 additions & 8 deletions src/alpine/3.17/helix/arm32v7/Dockerfile → src/alpine/3.17/helix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM arm32v7/alpine:3.17 as msquic
FROM library/alpine:3.17 AS msquic
ARG TARGETARCH

# build MsQuic as we don't have packages
RUN apk add --upgrade --no-cache \
Expand All @@ -18,20 +19,19 @@ RUN git clone --depth 1 --single-branch --branch v2.3.6 --recursive https://gith

WORKDIR /tmp/msquic

RUN cmake -B build/linux/arm_Release_openssl3 \
-DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/arm_Release_openssl3 \
RUN cmake -B build/linux/Release_openssl3 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TARGET_ARCHITECTURE=arm \
-DCMAKE_TARGET_ARCHITECTURE=${TARGETARCH} \
-DQUIC_TLS=openssl3 \
-DQUIC_ENABLE_LOGGING=true \
-DQUIC_USE_SYSTEM_LIBCRYPTO=true \
-DQUIC_BUILD_TOOLS=off \
-DQUIC_BUILD_TEST=off \
-DQUIC_BUILD_PERF=off && \
cmake --build build/linux/arm_Release_openssl3 --config Release && \
cmake --install build/linux/arm_Release_openssl3 --prefix /msquic
cmake --build build/linux/Release_openssl3 --config Release && \
cmake --install build/linux/Release_openssl3 --prefix /msquic

FROM arm32v7/alpine:3.17 as venv
FROM library/alpine:3.17 AS venv

RUN apk add --upgrade --no-cache \
libffi-dev \
Expand All @@ -50,7 +50,7 @@ RUN python3 -m venv /venv && \
pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
pip install ./helix_scripts-*-py3-none-any.whl

FROM arm32v7/alpine:3.17
FROM library/alpine:3.17

# Install .NET and test dependencies
RUN apk add --upgrade --no-cache \
Expand Down
90 changes: 0 additions & 90 deletions src/alpine/3.17/helix/arm64v8/Dockerfile
View file
Open in desktop

This file was deleted.

15 changes: 8 additions & 7 deletions src/alpine/3.17/helix/amd64/Dockerfile → src/alpine/3.18/helix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM amd64/alpine:3.17 AS msquic
FROM library/alpine:3.18 AS msquic
ARG TARGETARCH

# build MsQuic as we don't have packages
RUN apk add --upgrade --no-cache \
Expand All @@ -18,19 +19,19 @@ RUN git clone --depth 1 --single-branch --branch v2.3.6 --recursive https://gith

WORKDIR /tmp/msquic

RUN cmake -B build/linux/x64_Release_openssl3 \
-DQUIC_OUTPUT_DIR=/tmp/msquic/artifacts/bin/linux/x64_Release_openssl3 \
RUN cmake -B build/linux/Release_openssl3 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_TARGET_ARCHITECTURE=${TARGETARCH} \
-DQUIC_TLS=openssl3 \
-DQUIC_ENABLE_LOGGING=true \
-DQUIC_USE_SYSTEM_LIBCRYPTO=true \
-DQUIC_BUILD_TOOLS=off \
-DQUIC_BUILD_TEST=off \
-DQUIC_BUILD_PERF=off && \
cmake --build build/linux/x64_Release_openssl3 --config Release && \
cmake --install build/linux/x64_Release_openssl3 --prefix /msquic
cmake --build build/linux/Release_openssl3 --config Release && \
cmake --install build/linux/Release_openssl3 --prefix /msquic

FROM amd64/alpine:3.17 AS venv
FROM library/alpine:3.18 AS venv

RUN apk add --upgrade --no-cache \
cargo \
Expand All @@ -44,7 +45,7 @@ RUN python3 -m venv /venv && \
pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
pip install ./helix_scripts-*-py3-none-any.whl

FROM amd64/alpine:3.17
FROM library/alpine:3.18

# Install .NET and test dependencies
RUN apk add --upgrade --no-cache \
Expand Down
90 changes: 0 additions & 90 deletions src/alpine/3.18/helix/amd64/Dockerfile
View file
Open in desktop

This file was deleted.

90 changes: 0 additions & 90 deletions src/alpine/3.18/helix/arm32v7/Dockerfile
View file
Open in desktop

This file was deleted.

Loading