nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Dockerfile.arm32v7

Browse Source
This commit is contained in:
John
2021-10-10 16:46:50 +02:00
committed by GitHub
parent e2129ca160
commit c91b791861
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/docker/Dockerfile.arm32v7
+7 -8
View File
@@ -1,24 +1,22 @@
FROM multiarch/qemu-user-static as qemu FROM multiarch/qemu-user-static as qemu
FROM arm32v7/debian:bullseye as build FROM arm32v7/debian:jessie as build
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libmosquitto-dev libstdc++6 libc6 libgcc1 \ libmosquitto-dev libstdc++6 libc6 libgcc1 \
curl \ curl \
autoconf automake g++ make git \ autoconf automake g++ make git \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ADD . /build
WORKDIR /build WORKDIR /build
RUN ls && pwd
ENV EBUSD_ARCH arm32v7 ENV EBUSD_ARCH arm32v7
ENV EBUSD_VERSION 21.2 ENV EBUSD_VERSION 21.2
RUN git clone https://github.com/john30/ebusd.git /build \ RUN ./make_debian.sh --host `gcc -dumpmachine`
&& ./make_debian.sh
FROM arm32v7/debian:jessie-slim
FROM arm32v7/debian:bullseye-slim
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/ COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \ logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \
@@ -32,6 +30,7 @@ ENV EBUSD_ARCH arm32v7
LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}-devel" LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}-devel"
COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb
COPY --from=build /build/src/lib/ebus/test/test_data /test_data
RUN dpkg -i ebusd.deb \ RUN dpkg -i ebusd.deb \
&& ebusd -V \ && ebusd -V \
@@ -39,6 +38,6 @@ RUN dpkg -i ebusd.deb \
EXPOSE 8888 EXPOSE 8888
COPY docker-entrypoint.sh / COPY --from=build /build/contrib/docker/docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"] ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["-f", "--scanconfig"] CMD ["-f", "--scanconfig"]