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

run ebusd -V at last

Browse Source
This commit is contained in:
John
2022-02-19 12:16:04 +01:00
parent 2d45fb20a0
commit 095bb616ba
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/docker/Dockerfile
+3 -4
View File
@@ -43,10 +43,9 @@ 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
RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb \ RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb && rm -f ebusd.deb \
&& ebusd -V \ && update-ca-certificates \
&& rm -f ebusd.deb \ && ebusd -V
&& update-ca-certificates
EXPOSE 8888 EXPOSE 8888
contrib/docker/Dockerfile.release
+3 -4
View File
@@ -43,10 +43,9 @@ LABEL version="${EBUSD_VERSION}-${EBUSD_ARCH}"
ADD https://github.com/john30/ebusd/releases/download/v${EBUSD_VERSION}/ebusd-${EBUSD_VERSION}_${TARGETARCH}${TARGETVARIANT}-${EBUSD_IMAGE}_mqtt1.deb ebusd.deb ADD https://github.com/john30/ebusd/releases/download/v${EBUSD_VERSION}/ebusd-${EBUSD_VERSION}_${TARGETARCH}${TARGETVARIANT}-${EBUSD_IMAGE}_mqtt1.deb ebusd.deb
RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb \ RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb && rm -f ebusd.deb \
&& ebusd -V \ && update-ca-certificates \
&& rm -f ebusd.deb \ && ebusd -V
&& update-ca-certificates
EXPOSE 8888 EXPOSE 8888
contrib/docker/Dockerfile.template
+3 -4
View File
@@ -43,10 +43,9 @@ LABEL version="${EBUSD_VERSION}-${EBUSD_ARCH}%EBUSD_VERSION_VARIANT%"
%EBUSD_COPYDEB% %EBUSD_COPYDEB%
RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" ebusd.deb \ RUN dpkg -i "--path-exclude=/etc/default/*" "--path-exclude=/etc/init.d/*" "--path-exclude=/lib/systemd/*" %EBUSD_DEBSRC% \
&& ebusd -V \ && update-ca-certificates \
&& rm -f ebusd.deb \ && ebusd -V
&& update-ca-certificates
EXPOSE 8888 EXPOSE 8888
contrib/docker/update.sh
+2
View File
@@ -7,6 +7,7 @@ function replaceTemplate () {
-e "s#%EBUSD_VERSION_VARIANT%#${version_variant}#g" \ -e "s#%EBUSD_VERSION_VARIANT%#${version_variant}#g" \
-e "s#%EBUSD_UPLOAD_LINES%#${upload_lines}#g" \ -e "s#%EBUSD_UPLOAD_LINES%#${upload_lines}#g" \
-e "s#%EBUSD_COPYDEB%#${copydeb}#g" \ -e "s#%EBUSD_COPYDEB%#${copydeb}#g" \
-e "s#%EBUSD_DEBSRC%#${debsrc}#g" \
-e "s#%EBUSD_COPYENTRY%#${copyentry}#g" \ -e "s#%EBUSD_COPYENTRY%#${copyentry}#g" \
Dockerfile.template > "$file" Dockerfile.template > "$file"
echo "updated $file" echo "updated $file"
@@ -17,6 +18,7 @@ version_variant='-devel'
make='RUNTEST=full ./make_debian.sh' make='RUNTEST=full ./make_debian.sh'
upload_lines='' upload_lines=''
copydeb='COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb' copydeb='COPY --from=build /build/ebusd-*_mqtt1.deb ebusd.deb'
debsrc='ebusd.deb \&\& rm -f ebusd.deb'
copyentry='COPY --from=build /build/contrib/docker/docker-entrypoint.sh /' copyentry='COPY --from=build /build/contrib/docker/docker-entrypoint.sh /'
namesuffix='' namesuffix=''
replaceTemplate replaceTemplate