From 59de6c5944f7ac9ef977e3455693b22ae72c805a Mon Sep 17 00:00:00 2001
From: copyrights <219009+copyrights@users.noreply.github.com>
Date: Mon, 14 Aug 2023 17:31:17 +0200
Subject: [PATCH] update to Ubuntu 22.04 Jammy (#26)

* update to Ubuntu 22.04 Jammy

* removed to much

* remove wget's HSTS file

---------

Co-authored-by: copyrights <copyrights@mailbox.org>
---
 Dockerfile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 40beb85..4203e03 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:bionic
+FROM ubuntu:jammy
 MAINTAINER patrick@oberdorf.net
 
 ENV VERSION 1.17.1
@@ -6,17 +6,17 @@ ENV VERSION 1.17.1
 WORKDIR /usr/local/src/
 ADD assets/sha256checksum sha256checksum
 
-RUN apt-get update && apt-get install -y \
+RUN apt update && apt install -y \
 	build-essential \
 	tar \
 	wget \
 	libssl-dev \
 	libevent-dev \
-	libevent-2.1-6 \
+	libevent-2.1-7 \
 	libexpat1-dev \
 	libexpat1 \
 	dnsutils \
-	&& wget http://www.unbound.net/downloads/unbound-${VERSION}.tar.gz -P /usr/local/src/ \
+	&& wget --no-hsts http://www.unbound.net/downloads/unbound-${VERSION}.tar.gz -P /usr/local/src/ \
 	&& sha256sum -c sha256checksum \
 	&& tar -xvf unbound-${VERSION}.tar.gz \
 	&& rm unbound-${VERSION}.tar.gz \
@@ -26,17 +26,15 @@ RUN apt-get update && apt-get install -y \
 	&& make install \
 	&& cd ../ \
 	&& rm -R unbound-${VERSION} \
-	&& apt-get purge -y \
+	&& apt purge -y \
 	build-essential \
 	gcc \
-	gcc-4.8 \
 	cpp \
-	cpp-4.8 \
 	libssl-dev \
 	libevent-dev \
 	libexpat1-dev \
-	&& apt-get autoremove --purge -y \
-	&& apt-get clean \
+	&& apt autoremove --purge -y \
+	&& apt clean \
 	&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN useradd --system unbound --home /home/unbound --create-home
-- 
GitLab