Skip to content

Commit b3f7ac6

Browse files
committed
build: Support ubuntu-22.04
This bypass the reported issue, need some adaptations to support in main Relate-to: SiliconLabsSoftware#82 Signed-off-by: Philippe Coval <[email protected]>
1 parent 0c8dbf5 commit b3f7ac6

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

Dockerfile

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
11
# SPDX-License-Identifier: Zlib
22
# SPDX-FileCopyrightText: Silicon Laboratories Inc. https://www.silabs.com
33

4-
FROM debian:bookworm as builder
4+
FROM ubuntu:22.04 as builder
5+
6+
ENV DEBIAN_FRONTEND noninteractive
7+
ENV LC_ALL en_US.UTF-8
8+
ENV LANG ${LC_ALL}
59

610
ARG UNIFYSDK_GIT_REPOSITORY https://github.com/SiliconLabs/UnifySDK
711
ARG UNIFYSDK_GIT_TAG main
812

13+
RUN echo "# log: Configuring locales" \
14+
&& set -x \
15+
&& apt-get update -y \
16+
&& apt-get install -y locales \
17+
&& echo "${LC_ALL} UTF-8" | tee /etc/locale.gen \
18+
&& locale-gen ${LC_ALL} \
19+
&& dpkg-reconfigure locales \
20+
&& TZ=Etc/UTC apt-get -y install tzdata \
21+
&& date -u
22+
923
ENV project z-wave-protocol-controller
1024
ENV workdir /usr/local/opt/${project}
1125
ADD . ${workdir}
@@ -32,7 +46,7 @@ RUN echo "# log: Build" \
3246
&& ./helper.mk distclean \
3347
&& date -u
3448

35-
FROM debian:bookworm
49+
FROM ubuntu:22.04
3650
ENV project z-wave-protocol-controller
3751
ENV workdir /usr/local/opt/${project}
3852
COPY --from=builder ${workdir}/dist/ ${workdir}/dist/

helper.mk

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ packages+=graphviz
4545
export cmake_options+=-DDOXYGEN_HAVE_DOT=YES
4646

4747
packages+=python3-breathe python3-myst-parser \
48-
python3-sphinx-markdown-tables python3-sphinx-rtd-theme \
49-
python3-linkify-it
48+
python3-sphinx-markdown-tables python3-sphinx-rtd-theme
49+
50+
#packages+=python3-linkify-it # Disable for ubuntu-22.04 use "pip install linkify-it-py" instead
5051

5152
# TODO: https://bugs.debian.org/1004136#python-sphinxcontrib.plantuml
5253
# packages+=python3-sphinxcontrib.plantuml

0 commit comments

Comments
 (0)