From 503745bd17ab0114389fab69d0233f9fbb0a8a88 Mon Sep 17 00:00:00 2001
From: Hugo Thunnissen <devel@hugot.nl>
Date: Sat, 10 Feb 2024 21:37:46 +0100
Subject: [PATCH] Update node, php and go

---
 Dockerfile | 57 +++++++++++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 24 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 037f85b..842033e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,27 +53,27 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
 RUN add-apt-repository ppa:ondrej/php
 
 RUN apt-get update && apt-get -y install \
-    php8.2-memcached \
+    php8.3-memcached \
     php-redis \
-    php8.2-bcmath \
-    php8.2-bz2 \
-    php8.2-cli \
-    php8.2-common \
-    php8.2-curl \
-    php8.2-gmp \
-    php8.2-intl \
+    php8.3-bcmath \
+    php8.3-bz2 \
+    php8.3-cli \
+    php8.3-common \
+    php8.3-curl \
+    php8.3-gmp \
+    php8.3-intl \
     php-json \
-    php8.2-mbstring \
-    php8.2-mysql \
-    php8.2-odbc \
-    php8.2-opcache \
-    php8.2-pgsql \
-    php8.2-readline \
-    php8.2-tidy \
-    php8.2-xml \
-    php8.2-xsl \
-    php8.2-zip \
-    php8.2-gd \
+    php8.3-mbstring \
+    php8.3-mysql \
+    php8.3-odbc \
+    php8.3-opcache \
+    php8.3-pgsql \
+    php8.3-readline \
+    php8.3-tidy \
+    php8.3-xml \
+    php8.3-xsl \
+    php8.3-zip \
+    php8.3-gd \
     php-bcmath \
     php-apcu \
     php-cli \
@@ -85,14 +85,14 @@ 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') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+    && 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 composer-setup.php \
     && php -r "unlink('composer-setup.php');"
 RUN mv composer.phar /usr/bin/composer
 
 
 RUN mkdir -p /opt/nodejs
-RUN curl --location "https://nodejs.org/dist/v19.8.1/node-v19.8.1-linux-x64.tar.xz" | tar -Jxf - --strip-components=1 -C /opt/nodejs/
+RUN curl --location "https://nodejs.org/dist/v20.11.0/node-v20.11.0-linux-x64.tar.xz" | tar -Jxf - --strip-components=1 -C /opt/nodejs/
 # Make nodejs dir world-writable. This shouldn't be a problem as the container
 # will, naturally only have a single user that has acces to the volume.
 RUN chmod -R 777 /opt/nodejs
@@ -108,11 +108,12 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor -o /
 RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install docker-ce-cli apt-file
 RUN apt-file update
 
-RUN curl -fsSL https://github.com/woodpecker-ci/woodpecker/releases/download/v0.15.7/woodpecker-cli_linux_amd64.tar.gz \
-    | tar -xzf - -C /usr/bin/
+# Woodpecker no longer in use
+# RUN curl -fsSL https://github.com/woodpecker-ci/woodpecker/releases/download/v0.15.7/woodpecker-cli_linux_amd64.tar.gz \
+#     | tar -xzf - -C /usr/bin/
 
 
-RUN curl --location "https://golang.org/dl/go1.20.linux-amd64.tar.gz" | tar -xzf - -C /usr/local/
+RUN curl --location "https://golang.org/dl/go1.22.0.linux-amd64.tar.gz" | tar -xzf - -C /usr/local/
 #RUN ln -s /usr/local/go/bin/* /usr/local/bin/
 
 RUN GOPATH=/usr/local/gopkg /bin/bash -c 'for package in \
@@ -165,6 +166,14 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install libol
 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
 
 
+# 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
+
+# python dev stuff
+RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install libmysqlclient-dev python3-dev python3-pip
+
 ADD . /opt/workspace-repo
 WORKDIR /opt/workspace-repo
 RUN /usr/local/go/bin/go build .