From 4b3302bb49eafc44b7431204d352797625ad1cbf Mon Sep 17 00:00:00 2001
From: cn <cn@mycrobase.de>
Date: Thu, 26 Aug 2021 21:19:34 +0200
Subject: [PATCH] docker: update Alpine tools to fix openssl vulnerability

---
 CHANGELOG.md         | 6 ++++++
 Rakefile             | 2 +-
 docker/Dockerfile    | 2 +-
 docker/ci/Dockerfile | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc9683d..e4324ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.4.5
+
+OTHER:
+
+- re-release 3.4.4 to rebuild Docker image with security vulnerabilities fixes
+
 ## 3.4.4 (August 26th, 2021)
 
 OTHER:
diff --git a/Rakefile b/Rakefile
index 801f8f0..32c5977 100644
--- a/Rakefile
+++ b/Rakefile
@@ -26,7 +26,7 @@ hadolint_version = 'v2.7.0'
 
 desc 'Run hadolint for Dockerfile linting'
 task :hadolint do
-  sh "docker run --rm -i hadolint/hadolint:#{hadolint_version} hadolint --ignore DL3017 --ignore DL3018 - < docker/Dockerfile"
+  sh "docker run --rm -i hadolint/hadolint:#{hadolint_version} hadolint --ignore DL3018 - < docker/Dockerfile"
 end
 
 task default: [:rubocop, :spec, 'bundle:audit', :solargraph]
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6fe6baa..a4bb300 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,7 +5,7 @@ EXPOSE 5353 8080
 ARG DYNDNSD_VERSION
 
 RUN apk --no-cache add openssl ca-certificates && \
-    apk upgrade apk-tools && \
+    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} && \
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
index e60a72c..d24794c 100644
--- a/docker/ci/Dockerfile
+++ b/docker/ci/Dockerfile
@@ -5,6 +5,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 && \