Skip to content

Commit

Permalink
BUILD: update go and haproxy image
Browse files Browse the repository at this point in the history
  • Loading branch information
oktalz committed Jul 25, 2019
1 parent d407be1 commit fac3651
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build/Dockerfile
Expand Up @@ -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

Expand All @@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion fs/etc/init.d/haproxy
@@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh

case "$1" in
start)
Expand Down

0 comments on commit fac3651

Please sign in to comment.