S7IPA-168 Add extra base images support

.github/workflows/docker-builds.yaml

@@ -3,8 +3,7 @@ on: [push, pull_request]
 
 env:
   DOCKER_IMAGE_BASENAME: libpostal
-  BASE_IMAGES: "ruby:2.4-jessie ruby:2.4.9-stretch ubuntu:16.04 ubuntu:18.04"
-
+  BASE_IMAGES: "debian:8 debian:9 ubuntu:16.04 ubuntu:18.04"
 
 jobs:
   build:

Dockerfile

@@ -3,30 +3,26 @@ FROM ${BASE_IMAGE}
 ARG DEB_PACKAGE_NAME="libpostal"
 ARG DEB_PACKAGE_DESC="Debian wrapping for https://github.com/openvenues/libpostal"
 ARG DEB_PACKAGE_VERSION="0.0.1"
+ARG DEB_PACKAGE_STUART_VERSION="1"
 ARG BASE_PACKAGES="ruby ruby-dev rubygems build-essential curl autoconf automake libtool pkg-config git gettext"
 ENV APT_ARGS="-y -o APT::Install-Suggests=false -o APT::Install-Recommends=false"
 
 RUN apt-get update -qq && \
-    DEBIAN_FRONTEND=noninteractive apt-get install ${APT_ARGS} ${BASE_PACKAGES} && \
-    gem install --no-document fpm
+    DEBIAN_FRONTEND=noninteractive apt-get install ${APT_ARGS} ${BASE_PACKAGES}
+
+# compile libpostal
 COPY ./ /src
 WORKDIR /src
 RUN bash bootstrap.sh && \
     mkdir -p /output/usr && \
-    ./configure --prefix=/output/usr && \
+    ./configure --prefix=/output/usr --datadir=/usr/share/libpostal && \
     make -j && \
     make install
+
 # move out big files from the package
 WORKDIR /output
-RUN tar -zcf data.tgz usr/share/libpostal && \
-    rm -rf /output/usr/share/libpostal/*
+RUN tar -C / -zcf data.tgz usr/share/libpostal && \
+    rm -rf /output/usr/share/libpostal/* /usr/share/libpostal
+
 # build deb package
-RUN export DEB_PACKAGE_VERSION=$(sed 's|^v||' /src/versions/parser)+git$(bash -c 'cd /src; git rev-parse HEAD | head -c7') && \
-    envsubst '${DEB_PACKAGE_VERSION}' < /src/assets/fpm-deb-scripts/postinst.sh.tpl > /src/assets/fpm-deb-scripts/postinst.sh && \
-    fpm -n ${DEB_PACKAGE_NAME} \
-        -v ${DEB_PACKAGE_VERSION} \
-        --description "${DEB_PACKAGE_DESC}" \
-        -s dir \
-        -t deb \
-        --after-install /src/assets/fpm-deb-scripts/postinst.sh \
-        /output/usr=/
+RUN bash /src/assets/bin/fpm-packaging

assets/bin/fpm-packaging

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+INSTALLED_RUBY_VERSION=$(ruby --version | head -c8 | awk '{print $2}')
+# NOTE: latest official ruby ver for jessie is 2.1 and fpm requires >2.3, so we use rvm for jessie
+test -z ${FPM_REQUIRED_RUBY_VERSION+x} && FPM_REQUIRED_RUBY_VERSION=2.3
+
+dpkg --compare-versions ${INSTALLED_RUBY_VERSION} ge ${FPM_REQUIRED_RUBY_VERSION}
+if [ $? -ne 0 ]
+then
+  command curl -sSL https://rvm.io/mpapis.asc | gpg --import -
+  command curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -
+  curl -sSL https://get.rvm.io | bash -s stable
+  source /etc/profile.d/rvm.sh
+  rvm install ${FPM_REQUIRED_RUBY_VERSION}
+  rvm use ${FPM_REQUIRED_RUBY_VERSION}
+fi
+
+gem install --no-document fpm
+
+export DEB_PACKAGE_VERSION=$(sed 's|^v||' /src/versions/parser)-${DEB_PACKAGE_STUART_VERSION}+git$(bash -c 'cd /src; git rev-parse HEAD | head -c7')
+
+envsubst '${DEB_PACKAGE_VERSION}' < /src/assets/fpm-deb-scripts/postinst.sh.tpl > /src/assets/fpm-deb-scripts/postinst.sh
+
+fpm -n ${DEB_PACKAGE_NAME} \
+    -v ${DEB_PACKAGE_VERSION} \
+    --description "${DEB_PACKAGE_DESC}" \
+    -s dir \
+    -t deb \
+    --after-install /src/assets/fpm-deb-scripts/postinst.sh \
+    /output/usr=/
+

assets/fpm-deb-scripts/postinst.sh.tpl

@@ -1,10 +1,14 @@
 #!/bin/sh
 
 download_data() {
-  . /etc/lsb-release
+  if [ -e /etc/lsb-release ]; then . /etc/lsb-release; fi
+  if [ -e /etc/os-release ]; then . /etc/os-release; fi
   if [ "${DISTRIB_ID}" = "Ubuntu" ]
   then
-    curl -sL https://github.com/StuartApp/libpostal/releases/download/${GH_RELEASE}/ubuntu-${DISTRIB_RELEASE}-data-${GH_RELEASE}.tar.gz | tar -C / -zxf -
+    curl -sL https://github.com/StuartApp/libpostal/releases/download/${GH_RELEASE}/ubuntu_${DISTRIB_RELEASE}-data.tgz | tar -C / -zxf -
+  else
+    # we assume it's debian
+    curl -sL https://github.com/StuartApp/libpostal/releases/download/${GH_RELEASE}/debian_${VERSION_ID}-data.tgz | tar -C / -zxf -
   fi
 }
 
@@ -16,10 +20,12 @@ after_upgrade() {
 after_install() {
   echo "Installing data package '${GH_RELEASE}' from GH releases..."
   download_data
+  # workaround ruby_postal not using default include path
+  ln -nfs /usr/include/libpostal /usr/local/include/libpostal
 }
 
 export PACKAGE_VERSION=${DEB_PACKAGE_VERSION}
-export GH_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's|+git|-|')
+export GH_RELEASE=$(echo ${PACKAGE_VERSION} | sed 's|-.+git|-|')
 
 if [ "${1}" = "configure" -a -z "${2}" ] || \
    [ "${1}" = "abort-remove" ]