diff --git a/Dockerfile b/Dockerfile index 926878d..d185fd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ python3 python3-pip python3-virtualenv \ libcurl4-openssl-dev python-dev libproj-dev gdal-bin libmemcached-dev swig mutt \ ffmpeg libyaml-dev libc-client2007e-dev libonig-dev libkrb5-dev dialog \ whiptail tmux rsync nmap libzip-dev libfreetype6-dev \ -jpegoptim optipng pngquant gifsicle webp libvpx-dev libwebp-dev # User requirement (svgo not available) +jpegoptim optipng pngquant gifsicle webp libvpx-dev libwebp-dev jq inotify-tools ripgrep WORKDIR /srv @@ -44,56 +44,37 @@ ENV TERM xterm ## Node.js WORKDIR /usr/src ADD build_node.sh /usr/local/bin/build_node.sh -# 2021/11 -RUN build_node.sh 14.18.1 -RUN build_node.sh 15.14.0 -RUN build_node.sh 16.13.0 -RUN build_node.sh 17.1.0 -# 2022/04 -RUN build_node.sh 16.14.2 -RUN build_node.sh 18.0.0 +# 2022/12 +RUN build_node.sh 16.19.0 +RUN build_node.sh 17.9.1 +RUN build_node.sh 18.12.1 +RUN build_node.sh 19.3.0 ## Python WORKDIR /usr/src ADD build_python.sh /usr/local/bin/build_python.sh -# 2020/09 -RUN build_python.sh 3.9.7 -# 2021/11 -RUN build_python.sh 3.10.0 -# 2022/04 -RUN build_python.sh 3.10.4 - -## PHP -WORKDIR /usr/src -ADD build_php.sh /usr/local/bin/build_php.sh -# 2021/09 -RUN build_php.sh 7.4.23 -# 2021/11 -RUN build_php.sh 7.4.26 +# 2022/12 +RUN build_python.sh 3.9.16 +RUN build_python.sh 3.10.9 +RUN build_python.sh 3.11.1 ## PHP 8 ADD build_php8.sh /usr/local/bin/build_php8.sh -# 2021/11 -RUN build_php8.sh 8.0.13 -# 2022/04 -RUN build_php8.sh 8.0.18 -RUN build_php8.sh 8.1.5 +# 2022/12 +RUN build_php8.sh 8.1.13 +RUN build_php8.sh 8.2.0 ## Ruby WORKDIR /usr/src ADD build_ruby.sh /usr/local/bin/build_ruby.sh -# 2020/09 -RUN build_ruby.sh 2.7.4 -RUN build_ruby.sh 3.0.2 -# 2022/04 -RUN build_ruby.sh 3.1.2 +# 2022/12 +RUN build_ruby.sh 3.1.3 +RUN build_ruby.sh 3.2.0 ## Deno ADD build_deno.sh /usr/local/bin/build_deno.sh -# 2021/11 -RUN build_deno.sh 1.16.2 -# 2022/04 -RUN build_deno.sh 1.21.0 +# 2022/12 +RUN build_deno.sh 1.29.1 ############# diff --git a/Makefile b/Makefile index be4127d..a396e56 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ REPO=harbor.hq.rosti.cz/rosti/runtime DOCKER=docker -VERSION=2022.05-1 +VERSION=2022.12-1 all: build diff --git a/rosti.tmpl.sh b/rosti.tmpl.sh index 4216270..6fafcdf 100755 --- a/rosti.tmpl.sh +++ b/rosti.tmpl.sh @@ -2,6 +2,13 @@ . ~/.bashrc +# DEFAULT VERSIONS +VERSION_PYTHON=3.11.1 +VERSION_PHP=8.2.0 +VERSION_NODE=16.14.2 +VERSION_RUBY=3.2.0 +VERSION_DENO=1.29.1 + WIDTH=180 HEIGHT=25 @@ -164,31 +171,31 @@ function quickTech() { case $TECH in "python") if [ -z "$VERSION" ]; then - VERSION=3.10.4 + VERSION=$VERSION_PYTHON fi setTech $TECH-$VERSION ;; "php") if [ -z "$VERSION" ]; then - VERSION=8.1.5 + VERSION=$VERSION_PHP fi setTech $TECH-$VERSION ;; "node") if [ -z "$VERSION" ]; then - VERSION=16.14.2 + VERSION=$VERSION_NODE fi setTech $TECH-$VERSION ;; "ruby") if [ -z "$VERSION" ]; then - VERSION=3.0.2 + VERSION=$VERSION_RUBY fi setTech $TECH-$VERSION ;; "deno") if [ -z "$VERSION" ]; then - VERSION=1.21.0 + VERSION=$VERSION_DENO fi setTech $TECH-$VERSION ;;