From e8fbeeba3cb0637abc6af2b65e78277aa21715d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20=C5=A0trauch?= <cx@initd.cz>
Date: Fri, 3 Dec 2021 18:58:56 +0100
Subject: [PATCH] Version 2022.01-1

* Debian Bullseye
* New tech version:

Node.js 14.18.1
Node.js 15.14.0
Node.js 16.13.0
Node.js 17.1.0
Python 3.9.7
Python 3.10.0
PHP 7.4.23
PHP 7.4.26
PHP 8.0.13
Ruby 2.7.4
Ruby 3.0.2
Deno 1.16.2

Requested ed25519 support included in dropbear.
---
 Dockerfile                    | 13 +++++--------
 Makefile                      |  6 +++---
 gen_rosti.fish                |  2 +-
 rosti.sh.tmp => rosti.tmpl.sh | 10 +++++-----
 4 files changed, 14 insertions(+), 17 deletions(-)
 rename rosti.sh.tmp => rosti.tmpl.sh (98%)

diff --git a/Dockerfile b/Dockerfile
index 7ba213f..3ca36bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,12 @@
-FROM debian:buster
+FROM debian:11
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y wget gpg
 
-RUN echo "deb http://deb.debian.org/debian buster main contrib non-free" > /etc/apt/sources.list && \
-    echo "deb http://security.debian.org/debian-security buster/updates main" >> /etc/apt/sources.list && \
-    echo "deb http://deb.debian.org/debian buster-updates main contrib non-free" >> /etc/apt/sources.list
-
-RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" > /etc/apt/sources.list.d/pgdg.list && \
-    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
+RUN echo "deb http://deb.debian.org/debian/ bullseye main contrib non-free" > /etc/apt/sources.list && \
+    echo "deb http://security.debian.org/debian-security bullseye-security main" >> /etc/apt/sources.list && \
+    echo "deb http://deb.debian.org/debian/ bullseye-updates main contrib non-free" >> /etc/apt/sources.list
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales libffi-dev \
 libssl-dev default-libmysqlclient-dev ca-certificates libpq-dev libjpeg62 libjpeg-dev \
@@ -17,7 +14,7 @@ libpng-dev libpng-dev build-essential git mercurial build-essential \
 libbz2-dev libsqlite3-dev libreadline-dev zlib1g-dev libncurses5-dev \
 libgdbm-dev libgd-dev cron git subversion vim nano mc htop procps \
 dropbear gettext wget redis-server memcached supervisor curl ssh \
-mariadb-client postgresql-client-12 postgresql-12-postgis-3-scripts bind9-host dnsutils nginx \
+mariadb-client postgresql-client-13 postgresql-13-postgis-3-scripts bind9-host dnsutils nginx \
 libxml2-dev libxslt1-dev openssh-sftp-server links2 lynx \
 imagemagick libmagick++-6.q16-dev libmagick++-6.q16hdri-dev libmagickwand-dev ncdu libsodium-dev \
 python3 python3-pip python3-virtualenv \
diff --git a/Makefile b/Makefile
index f3487ff..7628314 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 REPO=harbor.hq.rosti.cz/rosti/runtime
 DOCKER=docker
-VERSION=2021.11-1
+VERSION=2022.01-1
 
 all: build
 
 build:
-	$(DOCKER) pull debian:buster
+	$(DOCKER) pull debian:11
 	$(DOCKER) build -t ${REPO}:dev .
 	$(DOCKER) tag ${REPO}:dev ${REPO}:$(VERSION)
 
@@ -13,7 +13,7 @@ test:
 	DOCKER=$(DOCKER) fish ./tests2.fish
 
 squashed:
-	$(DOCKER) pull debian:buster
+	$(DOCKER) pull debian:11
 	$(DOCKER) build --squash -t ${REPO}:dev-squashed .
 	$(DOCKER) tag ${REPO}:dev-squashed ${REPO}:$(VERSION)
 
diff --git a/gen_rosti.fish b/gen_rosti.fish
index 734008a..8125ed4 100755
--- a/gen_rosti.fish
+++ b/gen_rosti.fish
@@ -34,7 +34,7 @@ for line in (cat Dockerfile | grep "RUN build_")
     echo "                        \"$TECH-$VERSION\" \"  $TECH_VERBOSE $VERSION\" \\" >> $TECHS_FILE
 end
 
-cat rosti.sh.tmp | while read -l line
+cat rosti.tmpl.sh | while read -l line
     if [ "$line" = "{{TECHS}}" ]
         cat $TECHS_FILE
     else
diff --git a/rosti.sh.tmp b/rosti.tmpl.sh
similarity index 98%
rename from rosti.sh.tmp
rename to rosti.tmpl.sh
index b846f44..69946c0 100755
--- a/rosti.sh.tmp
+++ b/rosti.tmpl.sh
@@ -164,31 +164,31 @@ function quickTech() {
     case $TECH in
         "python")
             if [ -z "$VERSION" ]; then
-                VERSION=3.9.1
+                VERSION=3.10.0
             fi
             setTech $TECH-$VERSION
         ;;
         "php")
             if [ -z "$VERSION" ]; then
-                VERSION=7.4.15
+                VERSION=8.0.13
             fi
             setTech $TECH-$VERSION
         ;;
         "node")
             if [ -z "$VERSION" ]; then
-                VERSION=14.15.4
+                VERSION=16.13.0
             fi
             setTech $TECH-$VERSION
         ;;
         "ruby")
             if [ -z "$VERSION" ]; then
-                VERSION=3.0.0
+                VERSION=3.0.2
             fi
             setTech $TECH-$VERSION
         ;;
         "deno")
             if [ -z "$VERSION" ]; then
-                VERSION=1.7.2
+                VERSION=1.16.2
             fi
             setTech $TECH-$VERSION
         ;;