Skip to content

Commit

Permalink
chore(deps): update alpine docker tag to v3.19.0 (#664)
Browse files Browse the repository at this point in the history
* chore(deps): update alpine docker tag to v3.19.0

* fix(deps): Update alpine-deps for 3.19.0

* fix(deps): Updateb Debian Dockerfile to bookworm

* fix(converter): Add missing include

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Götz Görisch <g.goerisch@vdw.de>
  • Loading branch information
renovate[bot] and GoetzGoerisch authored Dec 8, 2023
1 parent 40f79dc commit 01fb596
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
22 changes: 11 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.debian
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
Expand Down
32 changes: 16 additions & 16 deletions OpcUaClient/Converter/UaToModelConverter.hpp
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -11,22 +11,22 @@

#include <string>
#include <map>
#include <cstdint>

namespace Umati {
namespace OpcUa {
namespace Converter {
class UaToModelConverter {
public:
explicit UaToModelConverter(const std::map<uint16_t, std::string> &idToUri);
namespace OpcUa {
namespace Converter {
class UaToModelConverter {
public:
explicit UaToModelConverter(const std::map<uint16_t, std::string> &idToUri);

virtual ~UaToModelConverter() = 0;
virtual ~UaToModelConverter() = 0;

protected:
protected:
std::string getUriFromNsIndex(uint16_t nsIndex);

std::string getUriFromNsIndex(uint16_t nsIndex);

const std::map<uint16_t, std::string> &m_idToUri;
};
}
}
}
const std::map<uint16_t, std::string> &m_idToUri;
};
} // namespace Converter
} // namespace OpcUa
} // namespace Umati

0 comments on commit 01fb596

Please sign in to comment.