Skip to content

update msquic in Alpine helix images#788

Merged
wfurt merged 1 commit intomainfrom
alpine2
Feb 7, 2023
Merged

update msquic in Alpine helix images#788
wfurt merged 1 commit intomainfrom
alpine2

Conversation

@wfurt
Copy link
Member

@wfurt wfurt commented Feb 7, 2023

We switch from msquic 2.1 to main so we can test upcoming 2.2.
main has now partial support for OpenSSL 3. I added 3.17 (current stable) image so we can test it.
I did not update ARM as we don't have immediate need to test it. (may come later)

3.15
$ ldd /usr/lib/libmsquic.so.2
	/lib/ld-musl-x86_64.so.1 (0x7f8b8ac74000)
	libcrypto.so.1.1 => /lib/libcrypto.so.1.1 (0x7f8b8a898000)
	libnuma.so.1 => /usr/lib/libnuma.so.1 (0x7f8b8a88b000)
	libc.musl-x86_64.so.1 => /lib/ld-musl-x86_64.so.1 (0x7f8b8ac74000)

3.17
$ ldd /usr/lib/libmsquic.so.2
	/lib/ld-musl-x86_64.so.1 (0x7ffa64506000)
	libcrypto.so.3 => /lib/libcrypto.so.3 (0x7ffa63fec000)
	libnuma.so.1 => /usr/lib/libnuma.so.1 (0x7ffa63fe0000)
	libc.musl-x86_64.so.1 => /lib/ld-musl-x86_64.so.1 (0x7ffa64506000)

@ghost ghost added the area-dockerfiles label Feb 7, 2023
CarnaViire
CarnaViire reviewed Feb 7, 2023
View reviewed changes
src/alpine/3.15/helix/amd64/Dockerfile
curl -L https://github.com/PowerShell/PowerShell/releases/download/v7.2.5/powershell-7.2.5-linux-alpine-x64.tar.gz | tar xfz - && \
cd .. && \
git clone --depth 1 --single-branch --branch release/7.0 --recursive https://github.com/dotnet/msquic && \
git clone --depth 1 --single-branch --branch main --recursive https://github.com/dotnet/msquic && \
Copy link
Member

@CarnaViire CarnaViire Feb 7, 2023

Choose a reason for hiding this comment

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

Does this image contain libnuma-dev?

Copy link
Member Author

@wfurt wfurt Feb 7, 2023

Choose a reason for hiding this comment

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

yes, it does. I did not add it explicitly so it is probably pulled in via dependency

fd3c746d0f75:/$ apk list | grep numa
numactl-2.0.16-r1 x86_64 {numactl} (LGPL-2.1-only) [installed]
numactl-dev-2.0.16-r1 x86_64 {numactl} (LGPL-2.1-only) [installed]
numactl-doc-2.0.16-r1 x86_64 {numactl} (LGPL-2.1-only)
numactl-tools-2.0.16-r1 x86_64 {numactl} (GPL-2.0-only)

more importantly, msquic builds - I assume this is what you ask

@wfurt wfurt merged commit 8bd98ed into main Feb 7, 2023
@wfurt wfurt deleted the alpine2 branch February 7, 2023 15:54
@mthalman mthalman mentioned this pull request Feb 7, 2023
Merged
@wfurt
Copy link
Member Author

wfurt commented Feb 9, 2023 

furt@ubu18:~/github/wfurt-runtime$ docker run -ti mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64-20230208010446-6d7b22b bash
Unable to find image 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64-20230208010446-6d7b22b' locally
alpine-3.17-helix-amd64-20230208010446-6d7b22b: Pulling from dotnet-buildtools/prereqs
8921db27df28: Already exists
c4af0000fae6: Downloading [============================================>      ]  510.4MB/568MB
c4af0000fae6: Pull complete
3c40a8232c63: Pull complete
684cf778779f: Pull complete
cc95b97a76cf: Pull complete
6cfbe756e785: Pull complete
Digest: sha256:1de1adef77c8fa96f7635b00a8cad84f72e309d4e2c07f15454974dd9674933b
Status: Downloaded newer image for mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64-20230208010446-6d7b22b

146a07f906d7:/$
146a07f906d7:/$ set | grep LANG
LANG=C.UTF-8

any idea what the LANG is not set @MattGal @mthalman ?
This breaks runtime localization tests ;(

https://helixre107v0xdeko0k025g8.blob.core.windows.net/dotnet-runtime-refs-pull-81841-merge-6a8738e2710547e3a8/System.ComponentModel.Annotations.Tests/1/console.96d3c290.log?helixlogtype=result

@MattGal
Copy link
Member

MattGal commented Feb 9, 2023

@wfurt I think this is an OS or docker bug. Your same changes are in https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/main/src/alpine/3.15/helix/amd64/Dockerfile and the same test passed on Alpine 3.15

@MattGal
Copy link
Member

MattGal commented Feb 9, 2023

Ah, it seems to be bash.

docker run -it mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-helix-amd64-20230208010517-6d7b22b
/ $ set | grep LANG
LANG='en-US.UTF-8'
/ $ bash
bash-5.1$ set | grep LANG
LANG=en-US.UTF-8
bash-5.1$ exit
exit
/ $ exit

... but ...

docker run -ti mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64-20230208010446-6d7b22b
/ $ set | grep LANG
LANG='en-US.UTF-8'
/ $ bash
ed086098fb54:/$ set | grep LANG
LANG=C.UTF-8
ed086098fb54:/$

As for why weird linux stuff happens that's usually the kind of question I ask YOU, @wfurt :)

basically Bash 5.2 doesn't like respecting the environment ?

@wfurt wfurt mentioned this pull request Feb 9, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CarnaViire CarnaViire CarnaViire left review comments

@ManickaP ManickaP ManickaP approved these changes

@mthalman mthalman mthalman approved these changes

Assignees

No one assigned

Labels

area-dockerfiles

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@wfurt @MattGal @CarnaViire @ManickaP @mthalman