Skip to content
This repository has been archived by the owner on Sep 21, 2020. It is now read-only.

[GPII-4057]: Lock gem versions with bundler #67

Merged
merged 9 commits into from
Aug 12, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
!cli/
!modules/
!terraform-plugins/
!gemfiles/
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ services:
# Build Exekube images and tag them
# Usage: `docker-compose build <service-name>`
google:
image: ${DOCKER_IMAGE:-exekube/exekube}:${CI_COMMIT_TAG:-0.9.2-google}
image: ${DOCKER_IMAGE:-exekube/exekube}:${CI_COMMIT_TAG:-0.9.3-google}
build:
context: .
dockerfile: dockerfiles/google/Dockerfile
Expand Down
13 changes: 7 additions & 6 deletions dockerfiles/google/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,16 @@ RUN apk --no-cache add \
ruby \
ruby-json

ENV GOOGLE_CLOUD_MONITORING_VERSION 0.29.2
ENV GOOGLE_CLOUD_LOGGING_VERSION 1.5.7
COPY gemfiles/google /gemfiles/google/
ENV BUNDLE_GEMFILE /gemfiles/google/Gemfile

RUN apk --no-cache add \
g++ \
make \
ruby-dev && \
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 \
ruby-dev \
&& gem install --no-ri --no-rdoc bundler rake \
&& bundle install \
&& apk del \
g++ \
make \
ruby-dev
Expand Down
6 changes: 6 additions & 0 deletions gemfiles/google/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source 'https://rubygems.org'

gem 'google-cloud-monitoring', '~> 0.30.0'
gem 'google-cloud-logging', '~> 1.6.6'
gem 'grpc'
gem 'etc'
71 changes: 71 additions & 0 deletions gemfiles/google/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
concurrent-ruby (1.1.5)
etc (1.0.1)
faraday (0.15.4)
multipart-post (>= 1.2, < 3)
google-cloud-core (1.3.0)
google-cloud-env (~> 1.0)
google-cloud-env (1.2.0)
faraday (~> 0.11)
google-cloud-logging (1.6.6)
concurrent-ruby (~> 1.1)
google-cloud-core (~> 1.2)
google-gax (~> 1.7)
googleapis-common-protos-types (>= 1.0.2)
stackdriver-core (~> 1.3)
google-cloud-monitoring (0.30.0)
google-gax (~> 1.7)
googleapis-common-protos-types (>= 1.0.2)
google-gax (1.7.0)
google-protobuf (~> 3.2)
googleapis-common-protos (>= 1.3.5, < 2.0)
googleauth (>= 0.6.2, < 0.10.0)
grpc (>= 1.7.2, < 2.0)
rly (~> 0.2.3)
google-protobuf (3.9.1)
googleapis-common-protos (1.3.9)
google-protobuf (~> 3.0)
googleapis-common-protos-types (~> 1.0)
grpc (~> 1.0)
googleapis-common-protos-types (1.0.4)
google-protobuf (~> 3.0)
googleauth (0.9.0)
faraday (~> 0.12)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
multi_json (~> 1.11)
os (>= 0.9, < 2.0)
signet (~> 0.7)
grpc (1.22.0)
google-protobuf (~> 3.8)
googleapis-common-protos-types (~> 1.0)
jwt (2.2.1)
memoist (0.16.0)
multi_json (1.13.1)
multipart-post (2.1.1)
os (1.0.1)
public_suffix (3.1.1)
rly (0.2.3)
signet (0.11.0)
addressable (~> 2.3)
faraday (~> 0.9)
jwt (>= 1.5, < 3.0)
multi_json (~> 1.10)
stackdriver-core (1.3.3)
google-cloud-core (~> 1.2)

PLATFORMS
ruby

DEPENDENCIES
etc
google-cloud-logging (~> 1.6.6)
google-cloud-monitoring (~> 0.30.0)
grpc

BUNDLED WITH
2.0.2