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

include knxd support in devel image (closes #1051)

Browse Source
This commit is contained in:
John
2023-12-25 15:29:00 +01:00
parent 84433b37de
commit a9a2484374
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/docker/Dockerfile
+3 -3
View File
@@ -3,7 +3,7 @@ ARG BASE_IMAGE
FROM $BASE_IMAGE as build FROM $BASE_IMAGE as build
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libmosquitto-dev libssl-dev libstdc++6 libc6 libgcc1 \ knxd-dev knxd- libmosquitto-dev libssl-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/*
@@ -20,7 +20,7 @@ ENV EBUSD_VERSION $EBUSD_VERSION
ENV GIT_REVISION $GIT_REVISION ENV GIT_REVISION $GIT_REVISION
ADD . /build ADD . /build
RUN RUNTEST=full GIT_REVISION=$GIT_REVISION ./make_debian.sh RUN RUNTEST=full GIT_REVISION=$GIT_REVISION ./make_debian.sh --with-knxd
@@ -28,7 +28,7 @@ RUN RUNTEST=full GIT_REVISION=$GIT_REVISION ./make_debian.sh
FROM $BASE_IMAGE-slim as image FROM $BASE_IMAGE-slim as image
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \ knxd-dev knxd- libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
LABEL maintainer="ebusd@ebusd.eu" LABEL maintainer="ebusd@ebusd.eu"
contrib/docker/Dockerfile.template
+2 -2
View File
@@ -3,7 +3,7 @@ ARG BASE_IMAGE
FROM $BASE_IMAGE as build FROM $BASE_IMAGE as build
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libmosquitto-dev libssl-dev libstdc++6 libc6 libgcc1 \ %EBUSD_EXTRAPKGS%libmosquitto-dev libssl-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/*
@@ -28,7 +28,7 @@ RUN %EBUSD_MAKE%
FROM $BASE_IMAGE-slim as image FROM $BASE_IMAGE-slim as image
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \ %EBUSD_EXTRAPKGS%libmosquitto1 libssl1.1 ca-certificates libstdc++6 libc6 libgcc1 \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
LABEL maintainer="ebusd@ebusd.eu" LABEL maintainer="ebusd@ebusd.eu"
contrib/docker/update.sh
+4 -2
View File
@@ -5,6 +5,7 @@ function replaceTemplate () {
sed \ sed \
-e "s#%EBUSD_MAKE%#${make}#g" \ -e "s#%EBUSD_MAKE%#${make}#g" \
-e "s#%EBUSD_VERSION_VARIANT%#${version_variant}#g" \ -e "s#%EBUSD_VERSION_VARIANT%#${version_variant}#g" \
-e "s#%EBUSD_EXTRAPKGS%#${extrapkgs}#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_DEBSRC%#${debsrc}#g" \
@@ -15,8 +16,8 @@ function replaceTemplate () {
# devel update # devel update
version_variant='-devel' version_variant='-devel'
make='RUNTEST=full GIT_REVISION=\$GIT_REVISION ./make_debian.sh' make='RUNTEST=full GIT_REVISION=\$GIT_REVISION ./make_debian.sh --with-knxd'
upload_lines='' extrapkgs='knxd-dev knxd- '
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' 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 /'
@@ -26,6 +27,7 @@ replaceTemplate
# release update # release update
version_variant='' version_variant=''
make='GIT_REVISION=\$GIT_REVISION ./make_debian.sh' make='GIT_REVISION=\$GIT_REVISION ./make_debian.sh'
extrapkgs=''
copydeb="ADD https://github.com/john30/ebusd/releases/download/\${EBUSD_VERSION}/ebusd-\${EBUSD_VERSION}_\${TARGETARCH}\${TARGETVARIANT}-\${EBUSD_IMAGE}_mqtt1.deb ebusd.deb" copydeb="ADD https://github.com/john30/ebusd/releases/download/\${EBUSD_VERSION}/ebusd-\${EBUSD_VERSION}_\${TARGETARCH}\${TARGETVARIANT}-\${EBUSD_IMAGE}_mqtt1.deb ebusd.deb"
copyentry='COPY contrib/docker/docker-entrypoint.sh /' copyentry='COPY contrib/docker/docker-entrypoint.sh /'
namesuffix='.release' namesuffix='.release'