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/Dockerfile
+1 -4
View File
@@ -9,15 +9,12 @@ 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_debian.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
contrib/docker/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_debian.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}-devel"
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/Dockerfile.arm32v7
+1 -4
View File
@@ -9,15 +9,12 @@ 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_debian.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
contrib/docker/Dockerfile.arm64v8
+1 -4
View File
@@ -9,15 +9,12 @@ 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_debian.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
contrib/docker/Dockerfile.i386
+1 -4
View File
@@ -9,15 +9,12 @@ 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_debian.sh
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
contrib/docker/Dockerfile.template
+2 -5
View File
@@ -9,16 +9,13 @@ RUN apt-get update && apt-get install -y \
WORKDIR /build
ENV EBUSD_VERSION %EBUSD_VERSION%
ENV EBUSD_ARCH %EBUSD_ARCH%
ENV EBUSD_VERSION %EBUSD_VERSION%
RUN git clone https://github.com/john30/ebusd.git /build \
&& %EBUSD_MAKE%
ARG UPLOAD_URL
ARG UPLOAD_CREDENTIALS
ARG UPLOAD_ONLY
%EBUSD_UPLOAD_LINE%
%EBUSD_UPLOAD_LINES%
FROM %BASE_IMAGE%-slim
contrib/docker/README.md
+1
View File
@@ -18,6 +18,7 @@ To download the latest release image from the hub, use the following command:
The image is able to run on any of the following architectures and the right image will be picked automatically:
* amd64
* i386
* arm32v5
* arm32v7
* arm64v8
contrib/docker/manifest.template
+5
View File
@@ -8,6 +8,11 @@ manifests:
platform:
architecture: 386
os: linux
- image: %image_name%-arm32v5
platform:
architecture: arm
os: linux
variant: v5
- image: %image_name%-arm32v7
platform:
architecture: arm
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
contrib/docker/update.sh
+18 -14
View File
@@ -1,8 +1,8 @@
#!/bin/bash
BASE_IMAGE=debian:stretch
DEFAULT_IMAGE=debian:stretch
EBUSD_VERSION=`cat ../../VERSION`
archs='amd64 i386 arm32v7:arm arm64v8:aarch64'
archs='amd64 i386 arm32v5:arm arm32v7:arm arm64v8:aarch64'
function replaceTemplate () {
prefix=
@@ -21,32 +21,36 @@ function replaceTemplate () {
fi
sed \
-e "s#%QEMU_FROM_LINE%#${qemu_from_line}#g" \
-e "s#%BASE_IMAGE%#${prefix}${BASE_IMAGE}#g" \
-e "s#%BASE_IMAGE%#${prefix}${BASE_IMAGE:-$DEFAULT_IMAGE}#g" \
-e "s#%QEMU_FROM_COPY%#${qemu_from_copy}#g" \
-e "s#%EBUSD_MAKE%#${make}#g" \
-e "s#%EBUSD_VERSION%#${EBUSD_VERSION}#g" \
-e "s#%EBUSD_VERSION_VARIANT%#${version_variant}#g" \
-e "s#%EBUSD_ARCH%#${arch}#g" \
-e "s#%EXTRA_RM%#${extra_rm}#g" \
-e "s#%EBUSD_UPLOAD_LINE%#${upload_line}#g" \
-e "s#%EBUSD_UPLOAD_LINES%#${upload_lines}#g" \
Dockerfile.template > "${dir}Dockerfile${suffix}"
echo "updated ${dir}Dockerfile${suffix}"
}
# devel updates
version_variant='-devel'
make='./make_debian.sh'
dir=''
upload_line=''
for arch in $archs; do
replaceTemplate
done
if [[ -z "$1" ]]; then
# devel updates
version_variant='-devel'
make='./make_debian.sh'
dir=''
upload_line=''
for arch in $archs; do
replaceTemplate
done
fi
# release updates
version_variant=''
make='./make_all.sh'
dir='release/'
upload_line='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'
dir=${1:-release/}
if [[ -n "$1" ]]; then
upload_lines='ARG UPLOAD_URL\nARG UPLOAD_CREDENTIALS\nARG UPLOAD_OS\nARG UPLOAD_ONLY\nRUN if [ -n "\$UPLOAD_URL" ] \&\& [ -n "\$UPLOAD_CREDENTIALS" ]; then for img in ebusd-*.deb; do echo -n "upload \$img: "; curl -fs -u "\$UPLOAD_CREDENTIALS" -X POST --data-binary "@\$img" -H "Content-Type: application/octet-stream" "\$UPLOAD_URL/\$img?a=\$EBUSD_ARCH\&o=\$UPLOAD_OS\&v=\$EBUSD_VERSION" || echo "failed"; done; if [ -n "\$UPLOAD_ONLY" ]; then echo "stopping for upload only"; exit 139; fi fi'
fi
for arch in $archs; do
replaceTemplate
done