fix -S in docker default command

pull/125/head
mpromonet 5 years ago
parent 64bec47c79
commit 6fdae72c09

@ -1,19 +1,17 @@
FROM debian as builder
LABEL maintainer michel.promonet@free.fr
WORKDIR /v4l2rtspserver
COPY . /v4l2rtspserver
RUN apt-get update && apt-get install -y --no-install-recommends g++ autoconf automake libtool xz-utils cmake make liblog4cpp5-dev pkg-config git wget
RUN cmake . && make install && apt-get clean && rm -rf /var/lib/apt/lists/
RUN apt-get update \
&& apt-get install -y --no-install-recommends g++ autoconf automake libtool xz-utils cmake make liblog4cpp5-dev pkg-config git wget \
&& cmake . && make install && apt-get clean && rm -rf /var/lib/apt/lists/
FROM ubuntu:18.04
WORKDIR /usr/local/share/v4l2rtspserver
COPY --from=builder /usr/local/bin/ /usr/local/bin/
COPY --from=builder /usr/local/share/v4l2rtspserver/ /usr/local/share/v4l2rtspserver/
EXPOSE 8554
ENTRYPOINT [ "/usr/local/bin/v4l2rtspserver" ]
CMD [ "-S -P ${PORT}" ]
CMD [ "-S" ]

@ -1,10 +1,10 @@
FROM debian as builder
LABEL maintainer michel.promonet@free.fr
WORKDIR /v4l2rtspserver
COPY . /v4l2rtspserver
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates g++ autoconf automake libtool xz-utils cmake make liblog4cpp5-dev pkg-config git wget \
RUN apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates g++ autoconf automake libtool xz-utils cmake make liblog4cpp5-dev pkg-config git wget \
&& wget -qO- https://releases.linaro.org/components/toolchain/binaries/6.4-2018.05/arm-linux-gnueabihf/gcc-linaro-6.4.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz | tar xJ \
&& export PATH=$(pwd)/gcc-linaro-6.4.1-2018.05-x86_64_arm-linux-gnueabihf/bin:$PATH \
&& cmake -DCMAKE_TOOLCHAIN_FILE=raspberry.toolchain . && make install \
@ -12,11 +12,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
FROM balenalib/rpi-raspbian
WORKDIR /usr/local/share/v4l2rtspserver
COPY --from=builder /usr/local/bin/ /usr/local/bin/
COPY --from=builder /usr/local/share/v4l2rtspserver/ /usr/local/share/v4l2rtspserver/
EXPOSE 8554
ENTRYPOINT [ "/usr/local/bin/v4l2rtspserver" ]
CMD [ "-S -P ${PORT}" ]
CMD [ "-S" ]

Loading…
Cancel
Save