From adf11ccd6af6351e1f53e0ba212dfc1bf20b51f2 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 4 Nov 2024 11:39:00 +0000 Subject: [PATCH] fedora-minimal adaptions Signed-off-by: Alexandra --- packaging/docker/Dockerfile.fedora-minimal | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/packaging/docker/Dockerfile.fedora-minimal b/packaging/docker/Dockerfile.fedora-minimal index 6af3e6722..52c9e51ac 100644 --- a/packaging/docker/Dockerfile.fedora-minimal +++ b/packaging/docker/Dockerfile.fedora-minimal @@ -26,9 +26,15 @@ RUN dnf -y install \ fmt-devel \ libwebsockets-devel +# For WebSocket / API access +EXPOSE 80 +EXPOSE 443 + ENV LC_ALL C.UTF-8 ENV LANG C.UTF-8 +WORKDIR /villas + FROM dev AS builder ARG CMAKE_OPTS @@ -37,21 +43,18 @@ COPY . /villas/ RUN rm -rf /villas/build && mkdir /villas/build WORKDIR /villas/build - RUN cmake ${CMAKE_OPTS} -DCPACK_GENERATOR=RPM .. && \ make -j$(nproc) package -FROM ${DISTRO}:${FEDORA_VERSION} as app +# FROM ${DISTRO}:${FEDORA_VERSION} as app -COPY --from=builder /villas/build/*.rpm /tmp/ -RUN dnf -y install /tmp/*.rpm +# COPY --from=builder /villas/build/*.rpm /tmp/ +# RUN dnf -y install /tmp/*.rpm -# Test if it runs -RUN villas node -h 2&>1 > /dev/null +# # Test if it runs +# RUN villas node -h 2&>1 > /dev/null -# For WebSocket / API access -EXPOSE 80 -EXPOSE 443 +WORKDIR /villas ENTRYPOINT ["villas"]