Skip to content

Commit

Permalink
Update Alpine to 2.8 and Go to 1.11
Browse files Browse the repository at this point in the history
Includes fixes to build and run `google-cloud-monitoring` and `-logging`
gems, which depend on `grpc` and `protobuf` and their native extensions
(see  protocolbuffers/protobuf#4460,
protocolbuffers/protobuf#2335,
gliderlabs/docker-alpine#424,
grpc/grpc#6525 for details)
  • Loading branch information
stepanstipl committed Dec 17, 2018
1 parent 1fbd414 commit 1fd0a41
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
4 changes: 2 additions & 2 deletions dockerfiles/alicloud/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# First stage -- compiling Exekube CLI
FROM golang:1.9-alpine AS builder
FROM golang:1.11.2-alpine3.8 AS builder

RUN apk add --no-cache \
git
Expand All @@ -16,7 +16,7 @@ ADD ./cli ./src/github.com/exekube/exekube/cli
RUN go build -o ./bin/xk github.com/exekube/exekube/cli

# Second stage -- getting all runtime deps
FROM alpine:3.7
FROM alpine:3.8

ENV ALIYUN_VERSION 3.0.0
ENV HELM_VERSION 2.8.2
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/aws/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ------------------------------------------------------------------------------
# First stage: compiling Exekube CLI
# ------------------------------------------------------------------------------
FROM golang:1.9-alpine AS builder
FROM golang:1.11.2-alpine3.8 AS builder

RUN apk add --no-cache \
git
Expand All @@ -20,7 +20,7 @@ RUN go build -o ./bin/xk github.com/exekube/exekube/cli
# ------------------------------------------------------------------------------
# Second stage: getting all runtime deps
# ------------------------------------------------------------------------------
FROM alpine:3.7
FROM alpine:3.8

ENV AWS_CLI_VERSION 1.15.41
ENV S3CMD_VERSION 2.0.1
Expand Down
7 changes: 5 additions & 2 deletions dockerfiles/google/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ------------------------------------------------------------------------------
# First stage: compiling Exekube CLI
# ------------------------------------------------------------------------------
FROM golang:1.9-alpine AS builder
FROM golang:1.11.2-alpine3.8 AS builder

RUN apk add --no-cache \
git
Expand All @@ -20,7 +20,7 @@ RUN go build -o ./bin/xk github.com/exekube/exekube/cli
# ------------------------------------------------------------------------------
# Second stage: getting all runtime deps
# ------------------------------------------------------------------------------
FROM alpine:3.7
FROM alpine:3.8

ENV CLOUD_SDK_VERSION 208.0.2
ENV KUBECTL_VERSION 1.10.5
Expand Down Expand Up @@ -52,6 +52,9 @@ RUN apk --no-cache add \
g++ \
make \
ruby-dev && \
# Following is needed for various native exptension issues on Alpine with protobuf and grpc plugins
gem update --system --no-ri --no-rdoc && \
gem install --no-ri google-protobuf:3.6.1 etc grpc --platform=ruby && \
gem install --no-ri --no-rdoc rake google-cloud-monitoring:${GOOGLE_CLOUD_MONITORING_VERSION} google-cloud-logging:${GOOGLE_CLOUD_LOGGING_VERSION} && \
apk del \
g++ \
Expand Down

0 comments on commit 1fd0a41

Please sign in to comment.