From 9ffa37263f1a30362ebce765809028a6ab8145e1 Mon Sep 17 00:00:00 2001
From: Hugo Thunnissen <devel@hugot.nl>
Date: Mon, 22 Jul 2024 21:29:11 +0200
Subject: [PATCH] Update to emacs 29.3

---
 Dockerfile | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 609b750..609a394 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,7 +32,7 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
     libmagickwand-dev imagemagick libacl1-dev libxml2-dev libgccjit-11-dev
 
 
-RUN wget https://ftp.gnu.org/gnu/emacs/emacs-29.1.tar.gz \
+RUN wget https://ftp.gnu.org/gnu/emacs/emacs-29.3.tar.gz \
     -O /tmp/emacs.tar.gz
 
 WORKDIR /tmp/emacs
@@ -86,7 +86,7 @@ RUN apt-get update && apt-get -y install \
 WORKDIR /tmp
 
 RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-    && php -r "if (hash_file('sha384', 'composer-setup.php') === 'edb40769019ccf227279e3bdd1f5b2e9950eb000c3233ee85148944e555d97be3ea4f40c3c2fe73b22f875385f6a5155') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+    && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
     && php composer-setup.php \
     && php -r "unlink('composer-setup.php');"
 RUN mv composer.phar /usr/bin/composer
@@ -164,19 +164,32 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install cargo
 RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install libolm-dev libclang-dev
 
 # Writing stuff
-RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc pandoc-citeproc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-bibtex-extra ispell idutch irussian ienglish-common offlineimap3 maildir-utils
+RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc pandoc-citeproc texlive-latex-base texlive-fonts-recommended texlive-fonts-extra texlive-latex-extra texlive-bibtex-extra ispell idutch irussian ienglish-common plantuml pandoc-plantuml-filter
 
 
 # Kubernetes stuff
 RUN curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
 RUN echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
-RUN apt-get update && apt-get -y install kubectl
+
+RUN curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null
+RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list
+RUN apt-get update && apt-get -y install kubectl helm
+
+RUN GOPATH=/usr/local/gopkg /bin/bash -c 'for package in \
+    github.com/cert-manager/cmctl/v2@latest; do \
+    /usr/local/go/bin/go install "$package"; done'
+
 
 # python dev stuff
 RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install libmysqlclient-dev python3-dev python3-pip
 
 RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install adwaita-icon-theme-full
 
+RUN curl -L --fail --remote-name-all https://github.com/cilium/cilium-cli/releases/download/"$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable.txt)"/cilium-linux-amd64.tar.gz{,.sha256sum}
+RUN sha256sum --check cilium-linux-amd64.tar.gz.sha256sum
+RUN tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
+RUN bash -c 'rm cilium-linux-amd64.tar.gz{,.sha256sum}'
+
 ADD . /opt/workspace-repo
 WORKDIR /opt/workspace-repo
 RUN /usr/local/go/bin/go build .