Skip to content

Commit d55f5fc

Browse files
rjaegersrjaegers
committed
Merge commit '208b6c9cda90925b83db838a9dc7748096cc25e7' into feature/add-docs-flavor
2 parents 2249054 + 208b6c9 commit d55f5fc

39 files changed

Lines changed: 395 additions & 125 deletions

‎.devcontainer/base/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ubuntu:26.04@sha256:53958ec7b67c2c9355df922dd08dbf0360611f8c3cdb656875e81873db9ffdba AS extractor
3+
FROM ubuntu:26.04@sha256:b7f48194d4d8b763a478a621cdc81c27be222ba2206ca3ca6bc42b49685f3d9e AS extractor
44

55
ARG BATS_CORE_VERSION=1.13.0
66
ARG BATS_SUPPORT_VERSION=0.3.0
@@ -20,7 +20,7 @@ RUN tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
2020
&& tar xzf /bats-support.tar.gz && mv bats-support-*/ bats-support \
2121
&& tar xzf /bats-assert.tar.gz && mv bats-assert-*/ bats-assert
2222

23-
FROM ubuntu:26.04@sha256:53958ec7b67c2c9355df922dd08dbf0360611f8c3cdb656875e81873db9ffdba
23+
FROM ubuntu:26.04@sha256:b7f48194d4d8b763a478a621cdc81c27be222ba2206ca3ca6bc42b49685f3d9e
2424

2525
ARG DEBIAN_FRONTEND=noninteractive
2626

‎.devcontainer/cpp/Dockerfile‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ARG BASE_IMAGE=ghcr.io/philips-software/amp-devcontainer-base:edge
77
ARG CCACHE_MINISIGN_PUBKEY=RWQX7yXbBedVfI4PNx6FLdFXu9GHUFsr28s4BVGxm4BeybtnX3P06saF
88
ARG CCACHE_VERSION=4.13.1
99
ARG XWIN_VERSION=0.8.0
10+
# Whether or not to build the embedded flavor of this container
11+
ARG BUILD_EMBEDDED_FLAVOR=false
1012

1113
# Downloader stage for AMD64 architecture
1214
FROM scratch AS downloader-amd64
@@ -50,6 +52,7 @@ FROM ${BASE_IMAGE} AS extractor
5052
ARG CCACHE_MINISIGN_PUBKEY
5153
ARG CCACHE_VERSION
5254
ARG XWIN_VERSION
55+
ARG BUILD_EMBEDDED_FLAVOR
5356

5457
SHELL ["/bin/bash", "-Eeuo", "pipefail", "-c"]
5558

@@ -61,21 +64,24 @@ RUN --mount=from=downloader,target=/dl \
6164
--mount=type=cache,target=/var/lib/apt,sharing=locked <<EOF
6265
apt-get update && apt-get install --no-install-recommends -y minisign
6366

64-
ARM_GNU_TOOLCHAIN_URL="https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-$(uname -m)-arm-none-eabi.tar.xz"
65-
ARM_GNU_TOOLCHAIN_TAR="/tmp/arm-gnu-toolchain.tar.xz"
67+
if [[ "${BUILD_EMBEDDED_FLAVOR}" == "true" ]]; then
68+
ARM_GNU_TOOLCHAIN_URL="https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-$(uname -m)-arm-none-eabi.tar.xz"
69+
ARM_GNU_TOOLCHAIN_TAR="/tmp/arm-gnu-toolchain.tar.xz"
6670

67-
if [[ "$(uname -m)" == "x86_64" ]]; then
68-
ARM_GNU_TOOLCHAIN_SHA256="597893282ac8c6ab1a4073977f2362990184599643b4c5ee34870a8215783a16"
69-
elif [[ "$(uname -m)" == "aarch64" ]]; then
70-
ARM_GNU_TOOLCHAIN_SHA256="d061559d814b205ed30c5b7c577c03317ec447ca51cd5a159d26b12a5bbeb20c"
71-
fi
71+
if [[ "$(uname -m)" == "x86_64" ]]; then
72+
ARM_GNU_TOOLCHAIN_SHA256="597893282ac8c6ab1a4073977f2362990184599643b4c5ee34870a8215783a16"
73+
elif [[ "$(uname -m)" == "aarch64" ]]; then
74+
ARM_GNU_TOOLCHAIN_SHA256="d061559d814b205ed30c5b7c577c03317ec447ca51cd5a159d26b12a5bbeb20c"
75+
fi
76+
77+
wget --no-hsts -qO "${ARM_GNU_TOOLCHAIN_TAR}" "${ARM_GNU_TOOLCHAIN_URL}"
78+
echo "${ARM_GNU_TOOLCHAIN_SHA256} ${ARM_GNU_TOOLCHAIN_TAR}" | sha256sum -c -
7279

73-
wget --no-hsts -qO "${ARM_GNU_TOOLCHAIN_TAR}" "${ARM_GNU_TOOLCHAIN_URL}"
74-
echo "${ARM_GNU_TOOLCHAIN_SHA256} ${ARM_GNU_TOOLCHAIN_TAR}" | sha256sum -c -
80+
tar xJf "${ARM_GNU_TOOLCHAIN_TAR}" --exclude="*arm-none-eabi-gdb*" --exclude="share"
81+
fi
7582

7683
minisign -P "${CCACHE_MINISIGN_PUBKEY}" -Vm /dl/ccache.tar.xz
7784

78-
tar xJf "${ARM_GNU_TOOLCHAIN_TAR}" --exclude="*arm-none-eabi-gdb*" --exclude="share"
7985
tar xJf /dl/ccache.tar.xz --strip-components=1 "ccache-${CCACHE_VERSION}-linux-$(uname -m)-glibc/ccache"
8086
tar xzf /dl/xwin.tar.gz --strip-components=1 "xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl/xwin"
8187
cp /dl/llvm.gpg.key /llvm.gpg.key
@@ -88,6 +94,7 @@ FROM ${BASE_IMAGE}
8894
ARG CLANG_VERSION=22
8995
ARG CPM_VERSION=0.42.1
9096
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.26
97+
ARG BUILD_EMBEDDED_FLAVOR
9198

9299
ARG DEBIAN_FRONTEND=noninteractive
93100

@@ -138,8 +145,10 @@ RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-base.json,target
138145
apt-get update && jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-clang.json | \
139146
xargs apt-get install -y --no-install-recommends
140147

141-
# Install arm-gcc toolchain
142-
cp -a /src/arm-gnu-toolchain-*-arm-none-eabi /opt/gcc-arm-none-eabi
148+
if [[ "${BUILD_EMBEDDED_FLAVOR}" == "true" ]]; then
149+
# Install arm-gcc toolchain
150+
cp -a /src/arm-gnu-toolchain-*-arm-none-eabi /opt/gcc-arm-none-eabi
151+
fi
143152
EOF
144153

145154
# Install include-what-you-use (iwyu) from source

‎.devcontainer/cpp/devcontainer-lock.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"features": {
3-
"ghcr.io/devcontainers/features/desktop-lite:1.2.9": {
4-
"version": "1.2.9",
5-
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:d8649bc8ca8e50a52fbee29d281739ea05dc1022905b185434d6bbe9afc8f221",
6-
"integrity": "sha256:d8649bc8ca8e50a52fbee29d281739ea05dc1022905b185434d6bbe9afc8f221"
3+
"ghcr.io/devcontainers/features/desktop-lite:1.2.10": {
4+
"version": "1.2.10",
5+
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:3cfd1ed97b027614f3a56d53183d20ebf29e9c36ac58a3d669edf39890e3aec3",
6+
"integrity": "sha256:3cfd1ed97b027614f3a56d53183d20ebf29e9c36ac58a3d669edf39890e3aec3"
77
},
88
"ghcr.io/devcontainers/features/github-cli:1.1.0": {
99
"version": "1.1.0",

‎.devcontainer/cpp/devcontainer-metadata.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"vscode": {
77
"extensions": [
88
"llvm-vs-code-extensions.vscode-clangd@0.6.0",
9-
"marus25.cortex-debug@1.12.1",
109
"mhutchie.git-graph@1.30.0",
1110
"ms-vscode.cmake-tools@1.23.52",
1211
"ms-vscode.cpptools@1.32.2",
@@ -16,12 +15,9 @@
1615
"settings": {
1716
"C_Cpp.intelliSenseEngine": "disabled",
1817
"clangd.arguments": [
19-
"--query-driver=/opt/**/arm-none-eabi-*",
2018
"--compile-commands-dir=${userHome}/.amp"
2119
],
2220
"cmake.copyCompileCommands": "${userHome}/.amp/compile_commands.json",
23-
"cortex-debug.gdbPath": "gdb-multiarch",
24-
"cortex-debug.objdumpPath": "arm-none-eabi-objdump",
2521
"sonarlint.pathToCompileCommands": "/root/.amp/compile_commands.json",
2622
"[c]": {
2723
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"

‎.devcontainer/cpp/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"NODE_EXTRA_CA_CERTS": "/etc/ssl/certs/ca-certificates.crt"
1616
},
1717
"features": {
18-
"ghcr.io/devcontainers/features/desktop-lite:1.2.9": {},
18+
"ghcr.io/devcontainers/features/desktop-lite:1.2.10": {},
1919
"ghcr.io/devcontainers/features/github-cli:1.1.0": {},
2020
"ghcr.io/devcontainers/features/node:2.1.0": {}
2121
},

‎.devcontainer/cpp/requirements.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
cmake==4.3.2
1+
cmake==4.3.4
22
conan==2.29.1
33
gcovr==8.6

‎.devcontainer/cpp/requirements.txt‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,26 @@ charset-normalizer==3.4.7 \
139139
--hash=sha256:fbccdc05410c9ee21bbf16a35f4c1d16123dcdeb8a1d38f33654fa21d0234f79 \
140140
--hash=sha256:fea24543955a6a729c45a73fe90e08c743f0b3334bbf3201e6c4bc1b0c7fa464
141141
# via requests
142-
cmake==4.3.2 \
143-
--hash=sha256:2b81038453a40aed73f8d28185c4c3ef43c3a91a7ff1577ce08e498769ecfe16 \
144-
--hash=sha256:339655b93289c1b03c6a72523d46d3b0d19dc51406d3a90f8eefcbec525cb271 \
145-
--hash=sha256:3947bc5973ca3846c76486993abd0fba0cb9119300d58ed9173a672d1eef505b \
146-
--hash=sha256:3c55f0c61c70642d9e7f6b4fc638622027f045b388e357d74efcca4a7111e4aa \
147-
--hash=sha256:5f47f5f00910c474662d09a0516413c6e9750bde73cdc52dea3988102a274e06 \
148-
--hash=sha256:67775407b963385a7942dd56f0567ef3c75453c6336654aeafe43165d78648bb \
149-
--hash=sha256:7105a5411bbc405242677d29222812028566aafac3f78fda08c1717f03e5ca2a \
150-
--hash=sha256:78049aac277aabe376d8e82993f0be234d086d0e8ad4708755d5a209a04e1138 \
151-
--hash=sha256:8add046a4ef7c606d8e0a444050415054c7da3b8535b2c8ce1f03e265dda098d \
152-
--hash=sha256:95e0ff31a692d12130f33d1467d0074f8314cf3a79940694896de9367b6e4fae \
153-
--hash=sha256:a69e629e6cd973e1f9b11d247d116acb47b35cdd8e39aee4b04b9040851cd8a0 \
154-
--hash=sha256:aae70bb95762f6da20131cf72da6322557ff6784968755d201d42a44cd9494e5 \
155-
--hash=sha256:b1c5c292b1189e48d01f0bed01ed800c31eed967afd033c4beabff9cc97209f2 \
156-
--hash=sha256:b218d636a99fa0eb23713d37d3e3c3a9c0e707e0579b46780ff908acef229386 \
157-
--hash=sha256:bc316be89fa43c265697c3b9ffcebde977bcc4515974372cc460c974f458ff98 \
158-
--hash=sha256:ca739ab0d8960261fdb1bb6e1e6c16b9cd033ae0a98341483cc233ba7c81b22b \
159-
--hash=sha256:d10648929eb3294449ceae7a7c0b9714ca445280ddc25c209f427e7a07c6f3a9 \
160-
--hash=sha256:ea95db137fd27f420d5e149c41e1f7621e786869afa3ca0fe18301df9e066607 \
161-
--hash=sha256:f8f570813753ed4564928cf45c4c13c31e46b3e66b1a07fe695cb9f7b7af185e
142+
cmake==4.3.4 \
143+
--hash=sha256:03ba364755daf56c279df01da15a0cabdb8cfe87adae991d01e91ac08ab44a31 \
144+
--hash=sha256:189a38a194b669e2d2c8419240abb28c68293bb4779cb4505106fe97b06b77f5 \
145+
--hash=sha256:1a5ed4d38ab184422ff393afa1893eadfc732c42cdc4b8364f93fdd00e39fe09 \
146+
--hash=sha256:1ab14fad08f03e85a1fc837f18e12f72acb215c44eff91231dbe7f871cb5112e \
147+
--hash=sha256:1b57929957ec779a55f00607e68e76f69e22701f42b0ac96502cf212e3953783 \
148+
--hash=sha256:232523e606c2089fc15bdc1e8f759268ca0dd03b9ccd31f30980dc723ace1d7e \
149+
--hash=sha256:250deb91d4a25427b67624b6b1ec2b52a995995797549d552bda1025e5b6d8da \
150+
--hash=sha256:269884c73a0710f07b006efbf5ba8ba2211e744302c79d02c9178333e0c91463 \
151+
--hash=sha256:2751beafd188d4eca8cfcef06ad3812728d10aa2686df82dfe85e071957f28a4 \
152+
--hash=sha256:3abe3d85f94804053eb192d735ea4d86d9ff2ee41f709a47d686d5bbf5037f10 \
153+
--hash=sha256:3c052ee4414a431bd8d4e01b3e7b6ddedfa2007430303aa5e442a4579e4db39e \
154+
--hash=sha256:5afc11495431a23d446b82fdb5f2aeeb8bde3a967c1f4fff278bdf4383422e54 \
155+
--hash=sha256:61a34a746853b3740c6ad494e51faf4d457b9ef82099e19974148808c31cc2eb \
156+
--hash=sha256:6372aa6565e3b38afbd634a7d4171ff1f0e4cd5a4bd92c948797cf721012e7b5 \
157+
--hash=sha256:757959349d216712bc311e7cd87f345f9143a90168294678f7017afe4dcae4e5 \
158+
--hash=sha256:c97e84a62cf71aaa4f012da5aea411b432b1361d78e6421f987679869aa0fa7a \
159+
--hash=sha256:ce0a77faf0a5c480616a29b778fe07dd19bba2d15b0b3d0e97798f12d1db7eff \
160+
--hash=sha256:ec21974344e7073dea495a961645316dc51bc7d38a8d8f29b0e19e4930d11f65 \
161+
--hash=sha256:fd2a9894a9aa798674a273d1e230b5ba9d1ab855d437ad86bf52f1cef29271b7
162162
# via -r cpp/requirements.in
163163
colorama==0.4.6 \
164164
--hash=sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44 \

‎.devcontainer/embedded-cpp-test/devcontainer.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"image": "ghcr.io/philips-software/amp-devcontainer-embedded-cpp:${localEnv:IMAGE_VERSION}",
3+
"workspaceFolder": "/workspaces/amp-devcontainer/test/embedded-cpp/workspace",
4+
"customizations": {
5+
"vscode": {
6+
"settings": {
7+
"cmake.automaticReconfigure": false,
8+
"cmake.configureOnOpen": false,
9+
"cmake.enableAutomaticKitScan": false
10+
}
11+
}
12+
}
13+
}

‎.devcontainer/embedded-cpp/devcontainer-lock.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"features": {
3+
"ghcr.io/devcontainers/features/desktop-lite:1.2.10": {
4+
"version": "1.2.10",
5+
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:3cfd1ed97b027614f3a56d53183d20ebf29e9c36ac58a3d669edf39890e3aec3",
6+
"integrity": "sha256:3cfd1ed97b027614f3a56d53183d20ebf29e9c36ac58a3d669edf39890e3aec3"
7+
},
8+
"ghcr.io/devcontainers/features/github-cli:1.1.0": {
9+
"version": "1.1.0",
10+
"resolved": "ghcr.io/devcontainers/features/github-cli@sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671",
11+
"integrity": "sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671"
12+
},
13+
"ghcr.io/devcontainers/features/node:2.1.0": {
14+
"version": "2.1.0",
15+
"resolved": "ghcr.io/devcontainers/features/node@sha256:586c9a6f7dd40bd3ba2cd41e7f2f88dcc31fbe5d1442afcbf07ffbc66b686857",
16+
"integrity": "sha256:586c9a6f7dd40bd3ba2cd41e7f2f88dcc31fbe5d1442afcbf07ffbc66b686857"
17+
}
18+
}
19+
}

‎.devcontainer/embedded-cpp/devcontainer-metadata.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"remoteEnv": {
3+
"LOCAL_WORKSPACE_FOLDER": "${localWorkspaceFolder}"
4+
},
5+
"customizations": {
6+
"vscode": {
7+
"extensions": [
8+
"llvm-vs-code-extensions.vscode-clangd@0.6.0",
9+
"marus25.cortex-debug@1.12.1",
10+
"mhutchie.git-graph@1.30.0",
11+
"ms-vscode.cmake-tools@1.23.52",
12+
"ms-vscode.cpptools@1.32.2",
13+
"ms-vsliveshare.vsliveshare@1.1.122",
14+
"sonarsource.sonarlint-vscode@5.3.0"
15+
],
16+
"settings": {
17+
"C_Cpp.intelliSenseEngine": "disabled",
18+
"clangd.arguments": [
19+
"--query-driver=/opt/**/arm-none-eabi-*",
20+
"--compile-commands-dir=${userHome}/.amp"
21+
],
22+
"cmake.copyCompileCommands": "${userHome}/.amp/compile_commands.json",
23+
"cortex-debug.gdbPath": "gdb-multiarch",
24+
"cortex-debug.objdumpPath": "arm-none-eabi-objdump",
25+
"sonarlint.pathToCompileCommands": "/root/.amp/compile_commands.json",
26+
"[c]": {
27+
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
28+
},
29+
"[cpp]": {
30+
"editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
31+
}
32+
}
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)