From 8c5111c54cd36137f10933c832a637dc64779439 Mon Sep 17 00:00:00 2001
From: Toni Melisma <59022391+tonimelisma@users.noreply.github.com>
Date: Sat, 24 Feb 2024 21:11:03 -0800
Subject: [PATCH] update dockerfiles

---
 build/Dockerfile-ubuntu-18.04 | 27 ---------------------------
 build/Dockerfile-ubuntu-20.04 | 29 -----------------------------
 build/Dockerfile-ubuntu-20.10 |  5 +++--
 build/Dockerfile-ubuntu-23.10 | 16 ++++++++++++++++
 4 files changed, 19 insertions(+), 58 deletions(-)
 delete mode 100644 build/Dockerfile-ubuntu-18.04
 delete mode 100644 build/Dockerfile-ubuntu-20.04
 create mode 100644 build/Dockerfile-ubuntu-23.10

diff --git a/build/Dockerfile-ubuntu-18.04 b/build/Dockerfile-ubuntu-18.04
deleted file mode 100644
index 27874fe0..00000000
--- a/build/Dockerfile-ubuntu-18.04
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM ubuntu:18.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Enable deb-src APT sources and get build tools
-RUN sed -e '/^#\sdeb-src /s/^# *//;t;d' "/etc/apt/sources.list" \
-    >> "/etc/apt/sources.list.d/ubuntu-sources.list"
-RUN apt-get update
-RUN apt-get -y --no-install-recommends install software-properties-common gpg-agent
-RUN apt-get -y --no-install-recommends install \
-    build-essential devscripts lsb-release dput wget git golang nvi
-RUN add-apt-repository -y ppa:tonimelisma/ppa
-RUN apt-get -y install --no-install-recommends libvips-dev
-RUN go get golang.org/dl/go1.15.4
-RUN ~/go/bin/go1.15.4 download
-RUN mkdir -p ~/go/src/github.com/davidbyttow
-RUN cd ~/go/src/github.com/davidbyttow  && git clone -v https://github.com/davidbyttow/govips.git
-RUN cd ~/go/src/github.com/davidbyttow/govips && ~/go/bin/go1.15.4 get ./...
-RUN cd ~/go/src/github.com/davidbyttow/govips && ~/go/bin/go1.15.4 test -v ./...
-
-
-ENV DEBFULLNAME="Toni Melisma"
-ENV DEBEMAIL="toni.melisma@iki.fi"
-ENV PPANAME="tonimelisma"
-ENV DISTRIBUTION="bionic"
-ENV DISTVERSION="18.04"
-ENV PACKAGE="vips"
\ No newline at end of file
diff --git a/build/Dockerfile-ubuntu-20.04 b/build/Dockerfile-ubuntu-20.04
deleted file mode 100644
index 6aac4c3d..00000000
--- a/build/Dockerfile-ubuntu-20.04
+++ /dev/null
@@ -1,29 +0,0 @@
-FROM ubuntu:20.04
-
-ENV DEBIAN_FRONTEND noninteractive
-
-# Enable deb-src APT sources and get build tools
-RUN sed -e '/^#\sdeb-src /s/^# *//;t;d' "/etc/apt/sources.list" \
-    >> "/etc/apt/sources.list.d/ubuntu-sources.list"
-RUN apt-get update
-RUN apt-get -y --no-install-recommends install software-properties-common gpg-agent
-RUN apt-get -y --no-install-recommends install \
-    build-essential devscripts lsb-release dput wget git golang nvi
-RUN add-apt-repository -y ppa:tonimelisma/ppa
-RUN add-apt-repository -y ppa:strukturag/libheif
-RUN add-apt-repository -y ppa:strukturag/libde265
-RUN apt-get -y install --no-install-recommends libvips-dev
-RUN go get golang.org/dl/go1.15.4
-RUN ~/go/bin/go1.15.4 download
-RUN mkdir -p ~/go/src/github.com/davidbyttow
-RUN cd ~/go/src/github.com/davidbyttow  && git clone -v https://github.com/davidbyttow/govips.git
-RUN cd ~/go/src/github.com/davidbyttow/govips && ~/go/bin/go1.15.4 get ./...
-RUN cd ~/go/src/github.com/davidbyttow/govips && ~/go/bin/go1.15.4 test -v ./...
-
-
-ENV DEBFULLNAME="Toni Melisma"
-ENV DEBEMAIL="toni.melisma@iki.fi"
-ENV PPANAME="tonimelisma"
-ENV DISTRIBUTION="focal"
-ENV DISTVERSION="20.04"
-ENV PACKAGE="vips"
diff --git a/build/Dockerfile-ubuntu-20.10 b/build/Dockerfile-ubuntu-20.10
index 9388ff07..3b3546c0 100644
--- a/build/Dockerfile-ubuntu-20.10
+++ b/build/Dockerfile-ubuntu-20.10
@@ -1,3 +1,5 @@
+# This Dockerfile can be used to build Ubuntu/Debian packages with govips
+
 FROM ubuntu:20.10
 
 ENV DEBIAN_FRONTEND noninteractive
@@ -9,7 +11,6 @@ RUN apt-get update
 RUN apt-get -y --no-install-recommends install software-properties-common gpg-agent
 RUN apt-get -y --no-install-recommends install \
     build-essential devscripts lsb-release dput wget git golang nvi
-RUN add-apt-repository -y ppa:tonimelisma/ppa
 RUN apt-get -y install --no-install-recommends libvips-dev
 RUN go get golang.org/dl/go1.15.4
 RUN ~/go/bin/go1.15.4 download
@@ -20,7 +21,7 @@ RUN cd ~/go/src/github.com/davidbyttow/govips && ~/go/bin/go1.15.4 test -v ./...
 
 
 ENV DEBFULLNAME="Toni Melisma"
-ENV DEBEMAIL="toni.melisma@iki.fi"
+ENV DEBEMAIL="toni@melisma.net"
 ENV PPANAME="tonimelisma"
 ENV DISTRIBUTION="groovy"
 ENV DISTVERSION="20.10"
diff --git a/build/Dockerfile-ubuntu-23.10 b/build/Dockerfile-ubuntu-23.10
new file mode 100644
index 00000000..5a7f6af7
--- /dev/null
+++ b/build/Dockerfile-ubuntu-23.10
@@ -0,0 +1,16 @@
+# This Dockerfile can be used to test and build govips
+
+FROM ubuntu:23.10
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Enable deb-src APT sources and get build tools
+RUN sed -e '/^#\sdeb-src /s/^# *//;t;d' "/etc/apt/sources.list" \
+    >> "/etc/apt/sources.list.d/ubuntu-sources.list"
+RUN apt-get update
+RUN apt-get -y --no-install-recommends install \
+    build-essential git golang
+RUN apt-get -y --no-install-recommends install ca-certificates
+RUN apt-get -y install --no-install-recommends libvips-dev
+RUN mkdir -p ~/go/src/github.com/davidbyttow
+RUN cd ~/go/src/github.com/davidbyttow  && git clone -v https://github.com/davidbyttow/govips.git
\ No newline at end of file