[airflow-pgbouncer-exporter] branch development updated: Add Hadolint compatibility

[potiuk]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch development
in repository https://gitbox.apache.org/repos/asf/airflow-pgbouncer-exporter.git


The following commit(s) were added to refs/heads/development by this push:
     new af9089e  Add Hadolint compatibility
af9089e is described below

commit af9089e9f69be7cc9b6eff928eac54c716defbbd
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sat Sep 5 12:01:20 2020 +0200

    Add Hadolint compatibility
---
 Dockerfile        |  9 +++------
 build_and_push.sh | 10 +++++-----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fde2b62..50a5bfc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,13 +26,10 @@ LABEL 
org.apache.airflow.pgbouncer_exporter.version="${PGBOUNCER_EXPORTER_VERSIO
 LABEL org.apache.airflow.go.version="${GO_VERSION}"
 LABEL 
org.apache.airflow.airflow_pgbouncer_exporter.version="${AIRFLOW_PGBOUNCER_EXPORTER_VERSION}"
 LABEL org.apache.airflow.commit_sha="${COMMIT_SHA}"
+LABEL maintainer="Apache Airflow Community <d...@airflow.apache.org>"
 
-MAINTAINER "Apache Airflow Community <d...@airflow.apache.org>"
-
-RUN set -ex \
-    && echo http://dl-cdn.alpinelinux.org/alpine/v3.7/main > 
/etc/apk/repositories \
-    && echo http://dl-cdn.alpinelinux.org/alpine/v3.7/community >> 
/etc/apk/repositories \
-    && apk upgrade --no-cache libressl libressl-dev
+# hadolint ignore=DL3018
+RUN apk --no-cache add libressl libressl-dev
 
 COPY pgbouncer_exporter /bin
 
diff --git a/build_and_push.sh b/build_and_push.sh
index 299b5b1..8596431 100755
--- a/build_and_push.sh
+++ b/build_and_push.sh
@@ -19,17 +19,17 @@ set -eu
 DOCKERHUB_USER=${DOCKERHUB_USER:="apache"}
 DOCKERHUB_REPO=${DOCKERHUB_REPO:="airflow"}
 PGBOUNCER_EXPORTER_VERSION="0.5.0"
-AIRFLOW_PGBOUNCER_EXPORTER_VERSION="2020.07.10"
-EXPECTED_GO_VERSION="1.14.4"
+AIRFLOW_PGBOUNCER_EXPORTER_VERSION="2020.09.05"
+EXPECTED_GO_VERSION="1.15.1"
 COMMIT_SHA=$(git rev-parse HEAD)
 
 cd "$( dirname "${BASH_SOURCE[0]}" )" || exit 1
 
-CURRENT_GO_VERSION=$("go${EXPECTED_GO_VERSION}" version 2>/dev/null | awk '{ 
print $3 }' 2>/dev/null)
+CURRENT_GO_VERSION=$("go${EXPECTED_GO_VERSION}" version 2>/dev/null | awk '{ 
print $3 }' 2>/dev/null || true)
 
 if [[ ${CURRENT_GO_VERSION} == "" ]]; then
   CURRENT_GO_VERSION=$(go version 2>/dev/null | awk '{ print $3 }' 2>/dev/null)
-  GO_BIN=$(command -v go 2>/dev/null)
+  GO_BIN=$(command -v go 2>/dev/null || true)
 else
   GO_BIN=$(command -v go${EXPECTED_GO_VERSION} 2>/dev/null)
 fi
@@ -60,7 +60,7 @@ fi
 
 # Needs to be set for alpine images to run net package of GO
 export CGO_ENABLED=0
-rm pgbouncer_exporter
+rm -f pgbouncer_exporter 2>/dev/null
 
 "${GO_BIN}" get ./...
 "${GO_BIN}" build