Need dedicated dockerfiles, one for each release

.gitlab-ci.yml

@@ -11,10 +11,10 @@ build-debian-stretch:
     paths:
       - build-stretch
   script:
-    - docker build -t radsecproxy-debbuild .
+    - docker build -f Dockerfile-stretch -t radsecproxy-debbuild-stretch .
     - rm -rf build-stretch
     - mkdir build-stretch
-    - docker run -i radsecproxy-debbuild | tar x -C build-stretch/
+    - docker run -i radsecproxy-debbuild-stretch | tar x -C build-stretch/
     - ls -l build-stretch/
 
 build-debian-buster:
@@ -26,10 +26,10 @@ build-debian-buster:
     paths:
       - build-buster
   script:
-    - docker build -t radsecproxy-debbuild .
+    - docker build -f Dockerfile-buster -t radsecproxy-debbuild-buster .
     - rm -rf build-buster
     - mkdir build-buster
-    - docker run -i radsecproxy-debbuild | tar x -C build-buster/
+    - docker run -i radsecproxy-debbuild-buster | tar x -C build-buster/
     - ls -l build-buster/
 
 deploy-apt:

Dockerfile → Dockerfile-buster

@@ -2,7 +2,6 @@ FROM debian:buster
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get install -y git curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl-dev nettle-dev docbook2x lsb-release
 WORKDIR /root/
-COPY patches patches
 COPY build.sh build.sh
 RUN ./build.sh
 CMD tar c *.deb

Dockerfile-stretch

+FROM debian:stretch
+RUN apt-get update && apt-get -y upgrade
+RUN apt-get install -y git curl build-essential debhelper dh-autoreconf dh-systemd autotools-dev libssl1.0-dev nettle-dev docbook2x lsb-release
+WORKDIR /root/
+COPY build.sh build.sh
+RUN ./build.sh
+CMD tar c *.deb

README.md

@@ -7,6 +7,6 @@ This docker will generate a .deb package for Radsecproxy.
 Edit **build.sh** and set the desired version number for Radsecproxy.
 
 ```
-docker build -t radsecproxy-debbuild .
+docker build -f Dockerfile-[stretch|buster] -t radsecproxy-debbuild .
 docker run -i radsecproxy-debbuild | tar x
 ```

build.sh

@@ -27,18 +27,10 @@ RADSECPROXY_URL="https://github.com/${package}/${package}"
 RADSECPROXY_SRCURL="${RADSECPROXY_URL}/releases/download/${version}/${package}-${version}.tar.gz"
 curl --silent -o "${package}"_"${version}".orig.tar.gz -L "${RADSECPROXY_SRCURL}"
 tar xzf "${package}"_"${version}".orig.tar.gz
-#git clone https://git.nordu.net/radsecproxy.git "${package}"-"${version}"
-#tar czf "${package}"_"${version}".orig.tar.gz "${package}"-"${version}"
-#( cd "${package}"-"${version}" ; aclocal ; automake --add-missing )
 
 apt-get source ${package}
 tar xf "${package}"_*.debian.tar.xz -C "${package}"-"${version}/"
 
-# cp patches/* "${package}"-"${version}"/debian/patches/
-# for patch in patches/* ; do
-#   echo ${patch##*/}
-# done >> "${package}"-"${version}"/debian/patches/series
-
 rm -r "${package}"-"${version}/debian/patches"
 
 cat > changelog << EOF