diff --git a/Dockerfile b/Dockerfile index c2c8895b..3476f414 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.18.5 as build-env +FROM alpine:3.19.0 as build-env RUN apk --no-cache add \ - bash=5.2.15-r5 \ - cmake=3.26.5-r0 \ - gcc=12.2.1_git20220924-r10 \ - g++=12.2.1_git20220924-r10\ - git=2.40.1-r0 \ - make=4.4.1-r1 \ - python3=3.11.6-r0 \ + bash=5.2.21-r0 \ + cmake=3.27.8-r0 \ + gcc=13.2.1_git20231014-r0 \ + g++=13.2.1_git20231014-r0\ + git=2.43.0-r0 \ + make=4.4.1-r2 \ + python3=3.11.6-r1 \ patch=2.7.6-r10 \ - linux-headers=6.3-r0 && \ + linux-headers=6.5-r0 && \ mkdir /install ARG BUILD_TYPE=Debug @@ -23,9 +23,9 @@ RUN cmake /src/DashboardOpcUaClient/.github/ \ -DCMAKE_INSTALL_PREFIX:PATH=/install /build &&\ cmake --build . -FROM alpine:3.18.5 as runtime +FROM alpine:3.19.0 as runtime RUN apk --no-cache add \ - libstdc++=12.2.1_git20220924-r10 \ + libstdc++=13.2.1_git20231014-r0 \ ca-certificates=20230506-r0 COPY --from=build-env /install/bin /app diff --git a/Dockerfile.debian b/Dockerfile.debian index bd4f58d4..50a250fd 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim as build-env +FROM debian:bookworm-slim as build-env # hadolint ignore=DL3008 RUN apt-get update && apt-get -yy --no-install-recommends install \ @@ -24,7 +24,7 @@ RUN cmake /src/DashboardOpcUaClient/.github/ \ -DCMAKE_INSTALL_PREFIX:PATH=/install /build &&\ cmake --build . -FROM debian:bullseye-slim as runtime +FROM debian:bookworm-slim as runtime RUN apt-get update && apt-get -yy install ca-certificates COPY --from=build-env /install/bin /app diff --git a/OpcUaClient/Converter/UaToModelConverter.hpp b/OpcUaClient/Converter/UaToModelConverter.hpp index 9a429cf8..2fb418f0 100644 --- a/OpcUaClient/Converter/UaToModelConverter.hpp +++ b/OpcUaClient/Converter/UaToModelConverter.hpp @@ -1,7 +1,7 @@ - /* This Source Code Form is subject to the terms of the Mozilla Public +/* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * * Copyright 2019-2021 (c) Christian von Arnim, ISW University of Stuttgart (for umati and VDW e.V.) * Copyright 2020 (c) Dominik Basner, Sotec GmbH (for VDW e.V.) * Copyright 2021 (c) Marius Dege, basysKom GmbH @@ -11,22 +11,22 @@ #include #include +#include namespace Umati { - namespace OpcUa { - namespace Converter { - class UaToModelConverter { - public: - explicit UaToModelConverter(const std::map &idToUri); +namespace OpcUa { +namespace Converter { +class UaToModelConverter { + public: + explicit UaToModelConverter(const std::map &idToUri); - virtual ~UaToModelConverter() = 0; + virtual ~UaToModelConverter() = 0; - protected: + protected: + std::string getUriFromNsIndex(uint16_t nsIndex); - std::string getUriFromNsIndex(uint16_t nsIndex); - - const std::map &m_idToUri; - }; - } - } -} + const std::map &m_idToUri; +}; +} // namespace Converter +} // namespace OpcUa +} // namespace Umati