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

Commit b5935a5

Browse files
Merge pull request #511 from chris-crone/bump-go-dep-alpine
Bump Golang, dep, alpine
2 parents 4dc618f + 1829fd1 commit b5935a5

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockercore/golang-cross:1.12.2@sha256:ea93d7ed5b464e5163cf8df40a198ad54afe6a59e1ca335c9bc4a5ed3702f2d0 AS build
1+
FROM dockercore/golang-cross:1.12.4@sha256:7ccd2d90d99974c7aad84660638590547495cfd3b1c78e6b5971fe944bf1ca51 AS build
22
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
33

44
RUN apt-get install -y -q --no-install-recommends \
@@ -18,7 +18,7 @@ WORKDIR /go/src/github.com/docker/app/
1818
# main dev image
1919
FROM build AS dev
2020
ENV PATH=${PATH}:/go/src/github.com/docker/app/bin/
21-
ARG DEP_VERSION=v0.5.0
21+
ARG DEP_VERSION=v0.5.1
2222
RUN curl -o /usr/bin/dep -L https://github.com/golang/dep/releases/download/${DEP_VERSION}/dep-linux-amd64 && \
2323
chmod +x /usr/bin/dep
2424
ARG GOTESTSUM_VERSION=v0.3.4

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.9.2
1+
ARG ALPINE_VERSION=3.9.3
22

3-
FROM dockercore/golang-cross:1.12.2@sha256:ea93d7ed5b464e5163cf8df40a198ad54afe6a59e1ca335c9bc4a5ed3702f2d0 AS build
3+
FROM dockercore/golang-cross:1.12.4@sha256:7ccd2d90d99974c7aad84660638590547495cfd3b1c78e6b5971fe944bf1ca51 AS build
44

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

Dockerfile.lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG ALPINE_VERSION=3.9
2-
ARG GO_VERSION=1.12.2
2+
ARG GO_VERSION=1.12.4
33

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

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.9.2
9+
ALPINE_VERSION=3.9.3
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)