Update base dockerfile image (#246)

* Update base dockerfile image

Author: marcinc

.circleci/config.yml

@@ -13,14 +13,17 @@ jobs:
   test:
     parallelism: 1
     docker:
-      - image: ruby:2.7.3-alpine3.13
+      - image: ruby:2.7.6-alpine3.14
         environment:
           BUNDLE_JOBS: 10
           BUNDLE_RETRY: 5
           BUNDLE_PATH: vendor/bundle
           KRANE_ENV: test
     steps:
       - checkout
+      - setup_remote_docker:
+          docker_layer_caching: true
+          version: 20.10.14
       - run:
           name: Install system deps
           command: apk add --update --no-cache git bash curl make gcc libc-dev tzdata g++ npm
@@ -41,7 +44,7 @@ jobs:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
-          version: 18.06.0-ce
+          version: 20.10.14
       - run:
           name: Build artifacts w/ Skaffold
           command: |
@@ -58,7 +61,7 @@ jobs:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
-          version: 18.06.0-ce
+          version: 20.10.14
       - run:
           name: Build & Push artifacts w/ Skaffold
           command: |
@@ -88,7 +91,7 @@ jobs:
       - checkout
       - setup_remote_docker:
           docker_layer_caching: true
-          version: 18.06.0-ce
+          version: 20.10.14
       - attach_workspace:
           at: ~/project
       - run:
@@ -104,7 +107,7 @@ jobs:
             export SKAFFOLD_LABEL="io.appvia.krane/git-sha=${CIRCLE_SHA1}"
             export SKAFFOLD_KUBE_CONTEXT=<<parameters.skaffold_kube_context>>
             export SKAFFOLD_NAMESPACE=<<parameters.skaffold_namespace>>
-            
+
             # Deploy with Skaffold - refers to artefacts built in previous step
             skaffold deploy --build-artifacts build/${CIRCLE_SHA1}.json
 

.ruby-version

@@ -1 +1 @@
-2.7.3
+2.7.6

Dockerfile

@@ -15,7 +15,7 @@
 
 ##############################################################
 # Stage: builder
-FROM ruby:2.7.3-alpine3.13 AS builder
+FROM ruby:2.7.6-alpine3.16 AS builder
 
 WORKDIR /app
 
@@ -25,7 +25,7 @@ RUN apk add --update --no-cache git bash curl make gcc libc-dev tzdata g++ npm
 COPY . /app
 
 # install bundler
-RUN gem install bundler --no-document -v $(cat Gemfile.lock | tail -n 1 | xargs)
+RUN gem install bundler --no-document -v $(cat Gemfile.lock | tail -1 | tr -d " ")
 
 # install gems
 RUN bundle config set deployment 'true'
@@ -37,7 +37,7 @@ RUN cd dashboard && npm install --no-optional && npm audit fix && npm rebuild no
 
 ##############################################################
 # Stage: final
-FROM ruby:2.7.3-alpine3.13
+FROM ruby:2.7.6-alpine3.16
 
 LABEL org="Appvia Ltd"
 LABEL website="appvia.io"
@@ -48,9 +48,10 @@ ENV APP_PATH /app
 
 RUN apk add --update --no-cache git bash curl npm yarn
 
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl && \
-	chmod +x ./kubectl && \
-	mv ./kubectl /usr/local/bin/kubectl
+ENV KUBECTL_VERSION="1.23.0"
+ENV KUBECTL_BINARY_URL=https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
+
+RUN curl -sL -o /usr/bin/kubectl ${KUBECTL_BINARY_URL} && chmod +x /usr/bin/kubectl
 
 RUN addgroup -g 1000 -S appuser \
  && adduser -u 1000 -S appuser -G appuser

Gemfile.lock

@@ -185,7 +185,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 2.2.10)
+  bundler (>= 2.2.28)
   byebug
   factory_bot
   krane!

krane.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '>= 2.2.10'
+  spec.add_development_dependency 'bundler', '>= 2.2.28'
   spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'profile'