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

remove unnecessary parts, add arm32v5, allow using different dir+image

Browse Source
This commit is contained in:
john30
2021-02-07 14:40:13 +01:00
parent 19072c4249
commit 333f929015
14 changed files with 124 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/docker/release/Dockerfile
+2 -5
View File
@@ -9,16 +9,13 @@ RUN apt-get update && apt-get install -y \
WORKDIR /build
ENV EBUSD_VERSION 21.1
ENV EBUSD_ARCH amd64
ENV EBUSD_VERSION 21.1
RUN git clone https://github.com/john30/ebusd.git /build \
&& ./make_all.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
RUN if [ -n "$UPLOAD_URL" ] && [ -n "$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload $img"; curl -u "$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@$img" -H "Content-Type: application/octet-stream" "$UPLOAD_URL/$img?a=$EBUSD_ARCH&v=$EBUSD_VERSION"; done; if [ -n "$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi
FROM debian:stretch-slim
contrib/docker/release/Dockerfile.arm32v5
+43
View File
@@ -0,0 +1,43 @@
FROM multiarch/qemu-user-static as qemu
FROM arm32v5/debian:stretch as build
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/
RUN apt-get update && apt-get install -y \
libmosquitto-dev libstdc++6 libc6 libgcc1 \
curl \
autoconf automake g++ make git \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build
ENV EBUSD_ARCH arm32v5
ENV EBUSD_VERSION 21.1
RUN git clone https://github.com/john30/ebusd.git /build \
&& ./make_all.sh
FROM arm32v5/debian:stretch-slim
COPY --from=qemu /usr/bin/qemu-arm-static /usr/bin/
RUN apt-get update && apt-get install -y \
logrotate libmosquitto1 libstdc++6 libc6 libgcc1 \
&& rm -rf /var/lib/apt/lists/*
LABEL maintainer "ebusd@ebusd.eu"
ENV EBUSD_VERSION 21.1
ENV EBUSD_ARCH arm32v5
LABEL version "${EBUSD_VERSION}-${EBUSD_ARCH}"
COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb
RUN dpkg -i ebusd.deb \
&& rm -f ebusd.deb /usr/bin/qemu-arm-static
EXPOSE 8888
COPY docker-entrypoint.sh /
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["-f", "--scanconfig"]
contrib/docker/release/Dockerfile.arm32v7
+2 -5
View File
@@ -9,16 +9,13 @@ RUN apt-get update && apt-get install -y \
WORKDIR /build
ENV EBUSD_VERSION 21.1
ENV EBUSD_ARCH arm32v7
ENV EBUSD_VERSION 21.1
RUN git clone https://github.com/john30/ebusd.git /build \
&& ./make_all.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
RUN if [ -n "$UPLOAD_URL" ] && [ -n "$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload $img"; curl -u "$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@$img" -H "Content-Type: application/octet-stream" "$UPLOAD_URL/$img?a=$EBUSD_ARCH&v=$EBUSD_VERSION"; done; if [ -n "$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi
FROM arm32v7/debian:stretch-slim
contrib/docker/release/Dockerfile.arm64v8
+2 -5
View File
@@ -9,16 +9,13 @@ RUN apt-get update && apt-get install -y \
WORKDIR /build
ENV EBUSD_VERSION 21.1
ENV EBUSD_ARCH arm64v8
ENV EBUSD_VERSION 21.1
RUN git clone https://github.com/john30/ebusd.git /build \
&& ./make_all.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
RUN if [ -n "$UPLOAD_URL" ] && [ -n "$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload $img"; curl -u "$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@$img" -H "Content-Type: application/octet-stream" "$UPLOAD_URL/$img?a=$EBUSD_ARCH&v=$EBUSD_VERSION"; done; if [ -n "$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi
FROM arm64v8/debian:stretch-slim
contrib/docker/release/Dockerfile.i386
+2 -5
View File
@@ -9,16 +9,13 @@ RUN apt-get update && apt-get install -y \
WORKDIR /build
ENV EBUSD_VERSION 21.1
ENV EBUSD_ARCH i386
ENV EBUSD_VERSION 21.1
RUN git clone https://github.com/john30/ebusd.git /build \
&& ./make_all.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
RUN if [ -n "$UPLOAD_URL" ] && [ -n "$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo "upload $img"; curl -u "$UPLOAD_CREDENTIALS" -s -X POST --data-binary "@$img" -H "Content-Type: application/octet-stream" "$UPLOAD_URL/$img?a=$EBUSD_ARCH&v=$EBUSD_VERSION"; done; if [ -n "$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi
FROM i386/debian:stretch-slim