Merge pull request #81 from hashicorp/sudomateo/various-updates

various project updates

.circleci/config.yml

@@ -3,7 +3,11 @@ version: 2.1
 executors:
   ruby:
     docker:
-      - image: docker.mirror.hashicorp.services/circleci/ruby:2.3.4-node
+        # This should really use the new `cimg/ruby:2.7.4-node` image instead.
+        # However, the HashiCorp mirror is currently not configured to mirror
+        # `cimg` images.
+        # https://circleci.com/docs/2.0/circleci-images/#next-generation-convenience-images
+      - image: docker.mirror.hashicorp.services/circleci/ruby:2.7.4-node
 
 commands:
   bundle-dependencies:
@@ -14,7 +18,7 @@ commands:
       gem-version:
         type: string
     steps:
-      - run: 
+      - run:
           name: Upgrade gem
           command: sudo gem update --system '<< parameters.gem-version >>'
       - run:
@@ -24,7 +28,7 @@ commands:
       - run:
           name: Bundle install
           command: |
-            bundle '_<< parameters.bundle-version >>_' install --jobs 7 --retry=3 --path=vendor/bundle 
+            bundle '_<< parameters.bundle-version >>_' install --jobs 7 --retry=3 --path=vendor/bundle
 
 jobs:
   build:
@@ -33,15 +37,15 @@ jobs:
     working_directory: ~/data
     steps:
       - checkout
-      - restore_cache: 
-          keys: 
+      - restore_cache:
+          keys:
             - gemfile-cache-{{ checksum "Gemfile.lock" }}
       - bundle-dependencies:
           bundle-version: '1.17.3'
           gem-version: '3.1.2'
-      - save_cache: 
+      - save_cache:
           key: gemfile-cache-{{ checksum "Gemfile.lock" }}
-          paths: 
+          paths:
             - ~/data/vendor/bundle
       - run: bundle exec rake
       - persist_to_workspace:
@@ -65,7 +69,7 @@ jobs:
       - run:
           name: Publish to RubyGems
           command: bundle exec rake release
-      - run: 
+      - run:
           name: Cleanup
           command: rm -rf /home/circleci/.gem/credentials
   docker-push:
@@ -87,7 +91,7 @@ workflows:
       - build
       - gem-push:
           context: middleman-hashicorp
-          requires: 
+          requires:
             - build
           filters:
             tags:
@@ -96,7 +100,7 @@ workflows:
               ignore: /.*/
       - docker-push:
           context: middleman-hashicorp
-          requires: 
+          requires:
             - build
           filters:
             tags:

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    middleman-hashicorp (0.3.44)
+    middleman-hashicorp (0.3.45)
       bootstrap-sass (~> 3.3)
       builder (~> 3.2)
       middleman (~> 3.4)

docker/Dockerfile

@@ -1,22 +1,21 @@
-FROM docker.mirror.hashicorp.services/ruby:2.3-alpine
-MAINTAINER Seth Vargo <[email protected]>
+FROM docker.mirror.hashicorp.services/ruby:2.7.4-alpine
 
 ARG GEM_VERSION
 
 # Install packages
-RUN apk add --no-cache bash build-base curl jq nodejs python py-setuptools wget git openssh-client
+RUN apk add --no-cache bash build-base ca-certificates curl jq nodejs python3 py3-setuptools wget git openssh-client
 
 # Install s3cmd
 RUN cd /tmp && \
-  wget https://github.com/s3tools/s3cmd/releases/download/v1.6.1/s3cmd-1.6.1.tar.gz && \
-  tar -xzvf s3cmd-1.6.1.tar.gz && \
-  cd s3cmd-1.6.1 && \
-  python setup.py install && \
+  curl -L -O https://github.com/s3tools/s3cmd/releases/download/v2.2.0/s3cmd-2.2.0.tar.gz && \
+  tar -xzvf s3cmd-2.2.0.tar.gz && \
+  cd s3cmd-2.2.0 && \
+  python3 setup.py install && \
   cd .. && \
-  rm -rf s3cmd-1.6.1*
+  rm -rf s3cmd-2.2.0*
 
 # Upgrade bundler
-RUN gem install bundler -v '~> 1.13' --no-document && \
+RUN gem install bundler -v '~> 1.17' --no-document && \
   gem cleanup
 
 # Install the bundle

lib/middleman-hashicorp/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module HashiCorp
-    VERSION = "0.3.44"
+    VERSION = "0.3.45"
   end
 end

middleman-hashicorp.gemspec

@@ -6,8 +6,7 @@ require 'middleman-hashicorp/version'
 Gem::Specification.new do |spec|
   spec.name          = 'middleman-hashicorp'
   spec.version       = Middleman::HashiCorp::VERSION
-  spec.authors       = ['Seth Vargo']
-  spec.email         = ['[email protected]']
+  spec.authors       = ['HashiCorp, Inc.']
   spec.summary       = 'A series of helpers for consistency among HashiCorp\'s middleman sites'
   spec.description   = spec.summary
   spec.homepage      = 'https://github.com/hashicorp/middleman-hashicorp'