From fac3651a4eeef001b737827201a119109a59731d Mon Sep 17 00:00:00 2001
From: Zlatko Bratkovic <zbratkovic@haproxy.com>
Date: Thu, 25 Jul 2019 08:20:38 +0200
Subject: [PATCH] BUILD: update go and haproxy image

---
 build/Dockerfile      | 6 +++---
 fs/etc/init.d/haproxy | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index daec48f1..6f523ca2 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.12.6-alpine AS builder
+FROM golang:1.12.7-alpine AS builder
 
 RUN apk --no-cache add git openssh
 
@@ -37,9 +37,9 @@ RUN mkdir -p /var/run/vars && \
 	-ldflags "-X main.GitRepo=$(cat /var/run/vars/GIT_REPO) -X main.GitTag=$(cat /var/run/vars/GIT_LAST_TAG) -X main.GitCommit=$(cat /var/run/vars/GIT_HEAD_COMMIT) -X main.GitDirty=$(cat /var/run/vars/GIT_MODIFIED) -X main.BuildTime=$(cat /var/run/vars/BUILD_DATE)" \
 	-o fs/haproxy-ingress-controller . 
 
-FROM haproxytech/haproxy-alpine:2.0
+FROM haproxytech/haproxy-alpine:2.0.2
 
-RUN apk --no-cache add socat openssl util-linux openrc htop bash make
+RUN apk --no-cache add socat openssl util-linux openrc htop
 
 COPY /fs /
 COPY --from=builder /src/fs/haproxy-ingress-controller .
diff --git a/fs/etc/init.d/haproxy b/fs/etc/init.d/haproxy
index 0207dd86..66e37712 100644
--- a/fs/etc/init.d/haproxy
+++ b/fs/etc/init.d/haproxy
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 case "$1" in 
 start)