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

Commit a41ba08

Browse files
authored
Merge pull request #593 from aiordache/bump-alpine
Bump alpine
2 parents 2218ab2 + bbcf4fa commit a41ba08

File tree

9 files changed

+10
-10
lines changed

9 files changed

+10
-10
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.12.6@sha256:5f4272cb7723c6f28e76abfd8b59e46d8f7264b0cf2d000ff49aee1d0577e7d0 AS build
1+
FROM dockercore/golang-cross:1.12.9@sha256:3ea9dcef4dd2c46d80445c0b22d6177817f4cfce22c523cc12a5a1091cb37705 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.10.0
1+
ARG ALPINE_VERSION=3.10.1
22

3-
FROM dockercore/golang-cross:1.12.6@sha256:5f4272cb7723c6f28e76abfd8b59e46d8f7264b0cf2d000ff49aee1d0577e7d0 AS build
3+
FROM dockercore/golang-cross:1.12.9@sha256:3ea9dcef4dd2c46d80445c0b22d6177817f4cfce22c523cc12a5a1091cb37705 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.10
2-
ARG GO_VERSION=1.12.6
2+
ARG GO_VERSION=1.12.9
33

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

e2e/testdata/cnab-parameters/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.9.2
1+
ARG ALPINE_VERSION=3.10.1
22

33
FROM alpine:${ALPINE_VERSION}
44

e2e/testdata/cnab-with-docker-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.9.2
1+
ARG ALPINE_VERSION=3.10.1
22

33
FROM alpine:${ALPINE_VERSION}
44

e2e/testdata/cnab-with-standard-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.9.2
1+
ARG ALPINE_VERSION=3.10.1
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.9.2
1+
ARG ALPINE_VERSION=3.10.1
22

33
FROM alpine:${ALPINE_VERSION}
44

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM alpine:3.7
1+
FROM alpine:3.10.1
22

33
CMD ["sleep", "9000"]

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.10.0
9+
ALPINE_VERSION=3.10.1
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)