fix for docker hub hooks, quicker build

john30 · Feb 8, 2021 · 4f7e2ea · 4f7e2ea
1 parent ed9e5a2
commit 4f7e2ea
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,4 +1,4 @@
-# 21.2 (2021-02-07)
+# 21.2 (2021-02-08)
 
 ## Bug Fixes
 * fix for UDP device connection issue

diff --git a/contrib/docker/Dockerfile.release b/contrib/docker/Dockerfile.release
@@ -13,7 +13,7 @@ ENV EBUSD_ARCH amd64
 ENV EBUSD_VERSION 21.2
 
 RUN git clone https://github.com/john30/ebusd.git /build \
-    && ./make_all.sh
+    && ./make_debian.sh
 
 
 

diff --git a/contrib/docker/Dockerfile.release.arm32v5 b/contrib/docker/Dockerfile.release.arm32v5
@@ -13,7 +13,7 @@ ENV EBUSD_ARCH arm32v5
 ENV EBUSD_VERSION 21.2
 
 RUN git clone https://github.com/john30/ebusd.git /build \
-    && ./make_all.sh
+    && ./make_debian.sh
 
 
 

diff --git a/contrib/docker/Dockerfile.release.arm32v7 b/contrib/docker/Dockerfile.release.arm32v7
@@ -13,7 +13,7 @@ ENV EBUSD_ARCH arm32v7
 ENV EBUSD_VERSION 21.2
 
 RUN git clone https://github.com/john30/ebusd.git /build \
-    && ./make_all.sh
+    && ./make_debian.sh
 
 
 

diff --git a/contrib/docker/Dockerfile.release.arm64v8 b/contrib/docker/Dockerfile.release.arm64v8
@@ -13,7 +13,7 @@ ENV EBUSD_ARCH arm64v8
 ENV EBUSD_VERSION 21.2
 
 RUN git clone https://github.com/john30/ebusd.git /build \
-    && ./make_all.sh
+    && ./make_debian.sh
 
 
 

diff --git a/contrib/docker/Dockerfile.release.i386 b/contrib/docker/Dockerfile.release.i386
@@ -13,7 +13,7 @@ ENV EBUSD_ARCH i386
 ENV EBUSD_VERSION 21.2
 
 RUN git clone https://github.com/john30/ebusd.git /build \
-    && ./make_all.sh
+    && ./make_debian.sh
 
 
 

diff --git a/contrib/docker/Dockerfile.template b/contrib/docker/Dockerfile.template
@@ -13,7 +13,7 @@ ENV EBUSD_ARCH %EBUSD_ARCH%
 ENV EBUSD_VERSION %EBUSD_VERSION%
 
 RUN git clone https://github.com/john30/ebusd.git /build \
-    && %EBUSD_MAKE%
+    && ./make_debian.sh
 
 %EBUSD_UPLOAD_LINES%
 

diff --git a/contrib/docker/update.sh b/contrib/docker/update.sh
@@ -23,33 +23,34 @@ function replaceTemplate () {
     -e "s#%QEMU_FROM_LINE%#${qemu_from_line}#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_LINES%#${upload_lines}#g" \
-    Dockerfile.template > "${dir}Dockerfile${suffix}"
+    Dockerfile.template > "${dir}Dockerfile${namesuffix}${suffix}"
   echo "updated ${dir}Dockerfile${suffix}"
 }
 
 if [[ -z "$1" ]]; then
   # devel updates
   version_variant='-devel'
-  make='./make_debian.sh'
   dir=''
   upload_line=''
+  namesuffix=''
   for arch in $archs; do
     replaceTemplate
   done
 fi
 
 # release updates
 version_variant=''
-make='./make_all.sh'
-dir=${1:-release/}
+dir="$1"
 if [[ -n "$1" ]]; then
   upload_lines='ARG UPLOAD_URL\nARG UPLOAD_CREDENTIALS\nARG UPLOAD_OS\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; fi'
+  namesuffix=''
+else
+  namesuffix='.release'
 fi
 for arch in $archs; do
   replaceTemplate