@@ -5,6 +5,7 @@ FROM ubuntu:26.04@sha256:f3d28607ddd78734bb7f71f117f3c6706c666b8b76cbff7c9ff6e57
55ARG BATS_CORE_VERSION=1.13.0
66ARG BATS_SUPPORT_VERSION=0.3.0
77ARG BATS_ASSERT_VERSION=2.2.4
8+ ARG XWIN_VERSION=0.8.0
89
910ADD --checksum=sha256:a122d4080a26c1da986bd0e7202b1630eb661a624915ef244f496fdd306e85fb \
1011 https://www.cisco.com/security/pki/certs/ciscoumbrellaroot.pem /cisco-umbrella-root.crt
@@ -15,10 +16,13 @@ ADD --checksum=sha256:7815237aafeb42ddcc1b8c698fc5808026d33317d8701d5ec2396e9634
1516 https://github.com/bats-core/bats-support/archive/refs/tags/v${BATS_SUPPORT_VERSION}.tar.gz /bats-support.tar.gz
1617ADD --checksum=sha256:e305df20c4c36cba4570e10f1cd824efb1ae71d88b5ef474550781ebee04192f \
1718 https://github.com/bats-core/bats-assert/archive/refs/tags/v${BATS_ASSERT_VERSION}.tar.gz /bats-assert.tar.gz
19+ ADD --checksum=sha256:8a354e12475dd154d0a2d3084eefd2c105f872ec8062965baaa7e9f2f76fe611 \
20+ https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-x86_64-unknown-linux-musl.tar.gz /xwin.tar.gz
1821
1922RUN tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
2023 && tar xzf /bats-support.tar.gz && mv bats-support-*/ bats-support \
21- && tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert
24+ && tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert \
25+ && tar xzf /xwin.tar.gz --strip-components=1 "xwin-${XWIN_VERSION}-x86_64-unknown-linux-musl/xwin"
2226
2327FROM ubuntu:26.04@sha256:f3d28607ddd78734bb7f71f117f3c6706c666b8b76cbff7c9ff6e5718d46ff64
2428
@@ -51,10 +55,21 @@ RUN --mount=type=bind,source=.devcontainer/base/apt-requirements.json,target=/tm
5155 cp -r /src/bats-support /usr/local/bats-support
5256 cp -r /src/bats-assert /usr/local/bats-assert
5357
58+ # Install xwin
59+ cp /src/xwin /usr/local/bin/xwin
60+
5461 # Generate locale
5562 sed -i '/C.UTF-8/s/^# //' /etc/locale.gen
5663 locale-gen
5764
5865 # Patch root's bashrc to include bash-completion
5966 cp /etc/skel/.bashrc /root/.bashrc
6067EOF
68+
69+ RUN xwin --accept-license splat --include-debug-libs --preserve-ms-arch-notation --output /winsdk \
70+ && rm -rf /root/.xwin-cache
71+
72+ RUN pip3 install --break-system-packages --no-cache-dir aqtinstall==3.3.0 \
73+ && aqt install-qt windows desktop 6.4.2 win64_msvc2019_64 --outputdir /opt/qt6-windows \
74+ && pip3 uninstall --break-system-packages -y aqtinstall \
75+ && rm -rf /tmp/aqt*
0 commit comments