diff --git a/Dockerfile b/Dockerfile index 0d116ef..32dab7a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,9 +51,10 @@ ENV TERM xterm WORKDIR /usr/src ADD build_node.sh /usr/local/bin/build_node.sh RUN build_node.sh 18.20.4 -RUN build_node.sh 20.18.0 +RUN build_node.sh 20.18.1 RUN build_node.sh 21.7.3 -RUN build_node.sh 22.9.0 +RUN build_node.sh 22.11.0 +RUN build_node.sh 23.3.0 ## Python # https://www.python.org/downloads/ @@ -66,36 +67,37 @@ RUN build_python.sh 3.13.0 ## PHP 8 # https://www.php.net/downloads.php ADD build_php8.sh /usr/local/bin/build_php8.sh -RUN build_php8.sh 8.2.24 -RUN build_php8.sh 8.3.12 +RUN build_php8.sh 8.2.26 +RUN build_php8.sh 8.3.14 +RUN build_php8.sh 8.4.1 ## Ruby # https://www.ruby-lang.org/en/downloads/releases/ WORKDIR /usr/src ADD build_ruby.sh /usr/local/bin/build_ruby.sh -RUN build_ruby.sh 3.2.5 -RUN build_ruby.sh 3.3.5 +RUN build_ruby.sh 3.2.6 +RUN build_ruby.sh 3.3.6 ## Deno # From: https://github.com/denoland/deno/releases ADD build_deno.sh /usr/local/bin/build_deno.sh RUN build_deno.sh 1.46.3 +RUN build_deno.sh 2.1.1 # Bun # From here: https://bun.sh/ ADD build_bun.sh /usr/local/bin/build_bun.sh -RUN build_bun.sh 1.1.29 +RUN build_bun.sh 1.1.36 # OpenJDK # From here: https://jdk.java.net/ ADD build_openjdk.sh /usr/local/bin/build_openjdk.sh -# RUN build_openjdk.sh 22.0.2 c9ecb94cd31b495da20a27d4581645e8 9 -RUN build_openjdk.sh 23 3c5b90190c68498b986a97f276efd28a 37 +RUN build_openjdk.sh 23.0.1 c28985cbf10d4e648e4004050f8781aa 11 # Golang # From here: https://go.dev/dl/ ADD build_golang.sh /usr/local/bin/build_golang.sh -RUN build_golang.sh 1.23.2 +RUN build_golang.sh 1.23.3 ############# diff --git a/Taskfile.yml b/Taskfile.yml index dea4925..b12bf6d 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -4,7 +4,8 @@ version: '3' vars: REPO: harbor.hq.rosti.cz/rosti/runtime - VERSION: 2024.10-1 + REPO_PUBLIC: rosti/runtime + VERSION: 2024.12-1 BASEIMAGE: debian:bookworm tasks: @@ -43,3 +44,16 @@ tasks: - docker push {{ .REPO }}:{{ .VERSION }} # deps: # - squashed + + install: + cmds: + - ssh rosti-node-23 docker pull {{ .REPO }}:{{ .VERSION }} + - ssh rosti-node-23 docker tag {{ .REPO }}:{{ .VERSION }} {{ .REPO_PUBLIC }}:{{ .VERSION }} + - ssh rosti-node-24 docker pull {{ .REPO }}:{{ .VERSION }} + - ssh rosti-node-24 docker tag {{ .REPO }}:{{ .VERSION }} {{ .REPO_PUBLIC }}:{{ .VERSION }} + - ssh rosti-node-25 docker pull {{ .REPO }}:{{ .VERSION }} + - ssh rosti-node-25 docker tag {{ .REPO }}:{{ .VERSION }} {{ .REPO_PUBLIC }}:{{ .VERSION }} + + publish: + cmds: + - ssh rosti-node-25 docker push {{ .REPO_PUBLIC }}:{{ .VERSION }} diff --git a/etc/nginx.conf b/etc/nginx.conf index 29367c2..b61f8b3 100644 --- a/etc/nginx.conf +++ b/etc/nginx.conf @@ -1,9 +1,9 @@ worker_processes 1; - error_log stderr; - pid /srv/run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + events { worker_connections 1024; @@ -82,3 +82,6 @@ http { include /srv/conf/nginx.d/*; } + +include /srv/conf/nginx.main.d/*; + diff --git a/rosti.tmpl.sh b/rosti.tmpl.sh index d41232d..a5c659a 100755 --- a/rosti.tmpl.sh +++ b/rosti.tmpl.sh @@ -4,13 +4,13 @@ # DEFAULT VERSIONS VERSION_PYTHON="3.13.0" -VERSION_PHP="8.3.12" -VERSION_NODE="22.9.0" -VERSION_RUBY="3.3.5" -VERSION_DENO="1.46.3" -VERSION_BUN="1.1.29" -VERSION_OPENJDK="23" -VERSION_GOLANG="1.23.2" +VERSION_PHP="8.4.1" +VERSION_NODE="23.3.0" +VERSION_RUBY="3.3.6" +VERSION_DENO="2.1.1" +VERSION_BUN="1.1.36" +VERSION_OPENJDK="23.0.1" +VERSION_GOLANG="1.23.3" WIDTH=180 HEIGHT=25