Skip to content

Commit 6ec1995

Browse files
authored
feat: add gnuplot-qt, Qt6, mesa, xkbcommon, xcb libs, xwin splat, and aqtinstall to base image
1 parent c4535dd commit 6ec1995

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

.devcontainer/base/Dockerfile

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ FROM ubuntu:26.04@sha256:f3d28607ddd78734bb7f71f117f3c6706c666b8b76cbff7c9ff6e57
55
ARG BATS_CORE_VERSION=1.13.0
66
ARG BATS_SUPPORT_VERSION=0.3.0
77
ARG BATS_ASSERT_VERSION=2.2.4
8+
ARG XWIN_VERSION=0.8.0
89

910
ADD --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
1617
ADD --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

1922
RUN 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

2327
FROM 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
6067
EOF
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*

.devcontainer/base/apt-requirements.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,15 @@
33
"ca-certificates": "20260223",
44
"git": "1:2.53.0-1ubuntu1",
55
"gnupg2": "2.4.8-4ubuntu3",
6+
"gnuplot-qt": "6.0.2+dfsg1-2ubuntu2",
7+
"libgl1-mesa-dev": "26.0.3-1ubuntu1",
8+
"libxcb-cursor0": "0.1.6-1",
9+
"libxcb-xinerama0": "1.17.0-2ubuntu1",
10+
"libxkbcommon-dev": "1.13.1-1",
11+
"libxkbcommon-x11-0": "1.13.1-1",
612
"locales": "2.43-2ubuntu2",
13+
"python3-pip": "25.1.1+dfsg-1ubuntu2",
14+
"qt6-base-dev": "6.10.2+dfsg-7",
715
"udev": "259.5-0ubuntu3",
816
"wget": "1.25.0-2ubuntu4",
917
"xz-utils": "5.8.3-1"

0 commit comments

Comments
 (0)