release: 3.4.8

- has lower complexity and works equally well in CI

.github/renovate.json5

@@ -9,6 +9,7 @@
   schedule: ["before 8am on thursday"],
   branchPrefix: "renovate-",
   dependencyDashboardHeader: "View repository job log [here](https://app.renovatebot.com/dashboard#github/cmur2/dyndnsd).",
+  separateMinorPatch: true,
   commitMessagePrefix: "project: ",
   commitMessageAction: "update",
   commitMessageTopic: "{{depName}}",
@@ -19,6 +20,12 @@
       matchManagers: ["bundler"],
       enabled: false,
     },
+    // prevent minor updates to Alpine 3.14 due to https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
+    {
+      matchManagers: ["dockerfile"],
+      matchUpdateTypes: ["minor"],
+      enabled: false,
+    },
     // Commit message formats
     {
       matchDatasources: ["docker"],

.github/workflows/ci.yml

@@ -31,13 +31,3 @@ jobs:
     - name: Lint and Test
       run: |
         bundle exec rake ci
-
-    # https://github.com/marketplace/actions/build-and-push-docker-images
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
-
-    - name: Test building Docker image for dyndnsd
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: docker/ci/Dockerfile

.gitignore

@@ -2,3 +2,5 @@
 *.lock
 pkg/*
 .yardoc
+hadolint
+trivy

.rubocop.yml

@@ -6,6 +6,9 @@ AllCops:
   TargetRubyVersion: '2.5'
   NewCops: enable
 
+Gemspec/RequireMFA:
+  Enabled: false
+
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 3.4.8 (December 11th, 2021)
+
+OTHER:
+
+- re-release 3.4.7 to rebuild Docker image with security vulnerabilities fixes
+
+## 3.4.7 (November 19th, 2021)
+
+OTHER:
+
+- re-release 3.4.6 to rebuild Docker image with security vulnerabilities fixes
+
+## 3.4.6 (November 19th, 2021)
+
+OTHER:
+
+- re-release 3.4.5 to rebuild Docker image with security vulnerabilities fixes
+
 ## 3.4.5 (August 26th, 2021)
 
 OTHER:

Rakefile

@@ -22,14 +22,34 @@ namespace :solargraph do
 end
 
 # renovate: datasource=github-tags depName=hadolint/hadolint
-hadolint_version = 'v2.7.0'
+hadolint_version = 'v2.8.0'
 
-desc 'Run hadolint for Dockerfile linting'
-task :hadolint do
-  sh "docker run --rm -i hadolint/hadolint:#{hadolint_version} hadolint --ignore DL3018 - < docker/Dockerfile"
+# renovate: datasource=github-tags depName=aquasecurity/trivy
+trivy_version = 'v0.21.2'
+
+namespace :docker do
+  desc 'Lint Dockerfile'
+  task :lint do
+    sh "if [ ! -e ./hadolint ]; then wget -q -O ./hadolint https://github.com/hadolint/hadolint/releases/download/#{hadolint_version}/hadolint-Linux-x86_64; fi"
+    sh 'chmod a+x ./hadolint'
+    sh './hadolint --ignore DL3018 docker/Dockerfile'
+    sh './hadolint --ignore DL3018 --ignore DL3028 docker/ci/Dockerfile'
+  end
+
+  desc 'Build CI Docker image'
+  task :build do
+    sh 'docker build -t cmur2/dyndnsd:ci -f docker/ci/Dockerfile .'
+  end
+
+  desc 'Scan CI Docker image for vulnerabilities'
+  task :scan do
+    ver = trivy_version.gsub('v', '')
+    sh "if [ ! -e ./trivy ]; then wget -q -O - https://github.com/aquasecurity/trivy/releases/download/v#{ver}/trivy_#{ver}_Linux-64bit.tar.gz | tar -xzf - trivy; fi"
+    sh './trivy cmur2/dyndnsd:ci'
+  end
 end
 
 task default: [:rubocop, :spec, 'bundle:audit', :solargraph]
 
 desc 'Run all tasks desired for CI'
-task ci: ['solargraph:init', :default, :hadolint, :build]
+task ci: ['solargraph:init', :default, 'docker:lint', :build, 'docker:build']

docker/Dockerfile

@@ -1,11 +1,10 @@
-FROM alpine:3.13.5
+FROM alpine:3.13.7
 
 EXPOSE 5353 8080
 
 ARG DYNDNSD_VERSION
 
 RUN apk --no-cache add openssl ca-certificates && \
-    apk upgrade apk-tools libcrypto1.1 libssl1.1 && \
     apk --no-cache add ruby ruby-etc ruby-io-console ruby-json ruby-webrick && \
     apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
     gem install --no-document dyndnsd -v ${DYNDNSD_VERSION} && \

docker/ci/Dockerfile

@@ -1,11 +1,10 @@
-FROM alpine:3.13.5
+FROM alpine:3.13.7
 
 EXPOSE 5353 8080
 
 COPY pkg/dyndnsd-*.gem /tmp/dyndnsd.gem
 
 RUN apk --no-cache add openssl ca-certificates && \
-    apk upgrade apk-tools libcrypto1.1 libssl1.1 && \
     apk --no-cache add ruby ruby-etc ruby-io-console ruby-json ruby-webrick && \
     apk --no-cache add --virtual .build-deps linux-headers ruby-dev build-base tzdata && \
     gem install --no-document /tmp/dyndnsd.gem && \

dyndnsd.gemspec

@@ -27,21 +27,21 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.5'
 
-  s.add_runtime_dependency 'async-dns', '~> 1.2.0'
+  s.add_runtime_dependency 'async-dns', '~> 1.3.0'
   s.add_runtime_dependency 'metriks'
   s.add_runtime_dependency 'opentelemetry-exporter-jaeger', '~> 0.20.0'
-  s.add_runtime_dependency 'opentelemetry-instrumentation-rack', '~> 0.19.0'
+  s.add_runtime_dependency 'opentelemetry-instrumentation-rack', '~> 0.20.0'
   s.add_runtime_dependency 'opentelemetry-sdk', '~> 1.0.0.rc2'
   s.add_runtime_dependency 'rack', '~> 2.0'
   s.add_runtime_dependency 'webrick', '>= 1.6.1'
 
   s.add_development_dependency 'bundler'
-  s.add_development_dependency 'bundler-audit', '~> 0.8.0'
+  s.add_development_dependency 'bundler-audit', '~> 0.9.0'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'rubocop', '~> 1.19.0'
+  s.add_development_dependency 'rubocop', '~> 1.23.0'
   s.add_development_dependency 'rubocop-rake', '~> 0.6.0'
-  s.add_development_dependency 'rubocop-rspec', '~> 2.4.0'
-  s.add_development_dependency 'solargraph', '~> 0.43.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.6.0'
+  s.add_development_dependency 'solargraph', '~> 0.44.0'
 end

lib/dyndnsd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dyndnsd
-  VERSION = '3.4.5'
+  VERSION = '3.4.8'
 end