Skip to content
This repository was archived by the owner on Jul 18, 2025. It is now read-only.

Commit 9110103

Browse files
Merge pull request #490 from zappy-shu/update-golang-1-12-1
updated go to v1.12.1 and alpine to 3.9.2
2 parents 9dfeeb8 + 8cc3dfc commit 9110103

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockercore/golang-cross:1.11.5@sha256:17a7e0f158521c50316a0d0c1ab1f6a75350b4d82e7ef03c98bcfbdf04feb4f3 AS build
1+
FROM dockercore/golang-cross:1.12.1@sha256:8541e3aea7b2cffb7ac310af250e34551abe2ec180c77d5a81ae3d52a47ac779 AS build
22
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
33

44
RUN apt-get install -y -q --no-install-recommends \

Dockerfile.invocation-image

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ARG ALPINE_VERSION=3.8
1+
ARG ALPINE_VERSION=3.9.2
22

3-
FROM dockercore/golang-cross:1.11.5@sha256:17a7e0f158521c50316a0d0c1ab1f6a75350b4d82e7ef03c98bcfbdf04feb4f3 AS build
3+
FROM dockercore/golang-cross:1.12.1@sha256:8541e3aea7b2cffb7ac310af250e34551abe2ec180c77d5a81ae3d52a47ac779 AS build
44

55
RUN apt-get install -y -q --no-install-recommends \
66
coreutils \

Dockerfile.lint

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG ALPINE_VERSION=3.8
2-
ARG GO_VERSION=1.11.0
1+
ARG ALPINE_VERSION=3.9
2+
ARG GO_VERSION=1.12.1
33

44
FROM golang:${GO_VERSION}-alpine${ALPINE_VERSION}
55
RUN apk add --no-cache \

e2e/testdata/cnab-with-status/cnab/build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG ALPINE_VERSION=3.8
1+
ARG ALPINE_VERSION=3.9.2
22

33
FROM alpine:${ALPINE_VERSION}
44

e2e/testdata/cnab-without-status/cnab/build/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG ALPINE_VERSION=3.8
1+
ARG ALPINE_VERSION=3.9.2
22

33
FROM alpine:${ALPINE_VERSION}
44

vars.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ E2E_NAME := $(BIN_NAME)-e2e
66
# Enable experimental features. "on" or "off"
77
EXPERIMENTAL := off
88

9-
ALPINE_VERSION=3.8
9+
ALPINE_VERSION=3.9.2
1010

1111
# Failing to resolve sh.exe to a full path denotes a windows vanilla shell.
1212
# Although 'simple' commands are still exec'ed, 'complex' ones are batch'ed instead of sh'ed.

0 commit comments

Comments
 (0)