First try for 2024.12-1, new versions of everything, fix ruby bug
Some checks are pending
Test build / build (push) Waiting to run

This commit is contained in:
Adam Štrauch 2025-01-19 14:30:03 +01:00
parent 4de583b57e
commit 6af035476b
Signed by: cx
GPG key ID: 7262DAFE292BCE20
4 changed files with 37 additions and 38 deletions

View file

@ -22,7 +22,8 @@ libcurl4-openssl-dev python3-dev libproj-dev gdal-bin libmemcached-dev swig mutt
ffmpeg libyaml-dev libc-client2007e-dev libonig-dev libkrb5-dev dialog \ ffmpeg libyaml-dev libc-client2007e-dev libonig-dev libkrb5-dev dialog \
whiptail tmux rsync nmap libzip-dev libfreetype6-dev \ whiptail tmux rsync nmap libzip-dev libfreetype6-dev \
jpegoptim optipng pngquant gifsicle webp libvpx-dev libwebp-dev jq inotify-tools ripgrep \ jpegoptim optipng pngquant gifsicle webp libvpx-dev libwebp-dev jq inotify-tools ripgrep \
wkhtmltopdf libzbar0 fzf wkhtmltopdf libzbar0 fzf \
gnupg2 unixodbc-dev apt-transport-https libgssapi-krb5-2 # for MS SQL Server extension
# This is stange thing in Debian 12, it blocks installation of chromium # This is stange thing in Debian 12, it blocks installation of chromium
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y luit RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y luit
@ -50,44 +51,43 @@ ENV TERM xterm
# From https://nodejs.org/en/about/previous-releases # From https://nodejs.org/en/about/previous-releases
WORKDIR /usr/src WORKDIR /usr/src
ADD build_node.sh /usr/local/bin/build_node.sh ADD build_node.sh /usr/local/bin/build_node.sh
RUN build_node.sh 18.20.4 RUN build_node.sh 18.20.5
RUN build_node.sh 20.18.1 RUN build_node.sh 20.18.1
RUN build_node.sh 21.7.3 RUN build_node.sh 21.7.3
RUN build_node.sh 22.11.0 RUN build_node.sh 22.13.0
RUN build_node.sh 23.3.0 RUN build_node.sh 23.6.0
## Python ## Python
# https://www.python.org/downloads/ # https://www.python.org/downloads/
WORKDIR /usr/src WORKDIR /usr/src
ADD build_python.sh /usr/local/bin/build_python.sh ADD build_python.sh /usr/local/bin/build_python.sh
RUN build_python.sh 3.11.10 RUN build_python.sh 3.11.11
RUN build_python.sh 3.12.7 RUN build_python.sh 3.12.8
RUN build_python.sh 3.13.0 RUN build_python.sh 3.13.1
## PHP 8 ## PHP 8
# https://www.php.net/downloads.php # https://www.php.net/downloads.php
ADD build_php8.sh /usr/local/bin/build_php8.sh ADD build_php8.sh /usr/local/bin/build_php8.sh
RUN build_php8.sh 8.2.26 RUN build_php8.sh 8.3.16
RUN build_php8.sh 8.3.14 RUN build_php8.sh 8.4.3
RUN build_php8.sh 8.4.1
## Ruby ## Ruby
# https://www.ruby-lang.org/en/downloads/releases/ # https://www.ruby-lang.org/en/downloads/releases/
WORKDIR /usr/src WORKDIR /usr/src
ADD build_ruby.sh /usr/local/bin/build_ruby.sh ADD build_ruby.sh /usr/local/bin/build_ruby.sh
RUN build_ruby.sh 3.2.6 RUN build_ruby.sh 3.3.7
RUN build_ruby.sh 3.3.6 RUN build_ruby.sh 3.4.1
## Deno ## Deno
# From: https://github.com/denoland/deno/releases # From: https://github.com/denoland/deno/releases
ADD build_deno.sh /usr/local/bin/build_deno.sh ADD build_deno.sh /usr/local/bin/build_deno.sh
RUN build_deno.sh 1.46.3 RUN build_deno.sh 1.46.3
RUN build_deno.sh 2.1.1 RUN build_deno.sh 2.1.6
# Bun # Bun
# From here: https://bun.sh/ # From here: https://bun.sh/
ADD build_bun.sh /usr/local/bin/build_bun.sh ADD build_bun.sh /usr/local/bin/build_bun.sh
RUN build_bun.sh 1.1.36 RUN build_bun.sh 1.1.45
# OpenJDK # OpenJDK
# From here: https://jdk.java.net/ # From here: https://jdk.java.net/
@ -97,7 +97,7 @@ RUN build_openjdk.sh 23.0.1 c28985cbf10d4e648e4004050f8781aa 11
# Golang # Golang
# From here: https://go.dev/dl/ # From here: https://go.dev/dl/
ADD build_golang.sh /usr/local/bin/build_golang.sh ADD build_golang.sh /usr/local/bin/build_golang.sh
RUN build_golang.sh 1.23.3 RUN build_golang.sh 1.23.5
############# #############

View file

@ -5,7 +5,7 @@ version: '3'
vars: vars:
REPO: harbor.hq.rosti.cz/rosti/runtime REPO: harbor.hq.rosti.cz/rosti/runtime
REPO_PUBLIC: rosti/runtime REPO_PUBLIC: rosti/runtime
VERSION: 2024.12-1 VERSION: 2025.01-1
BASEIMAGE: debian:bookworm BASEIMAGE: debian:bookworm
tasks: tasks:
@ -47,13 +47,9 @@ tasks:
install: install:
cmds: cmds:
- ssh rosti-node-23 docker pull {{ .REPO }}:{{ .VERSION }} - ssh rosti-node-26 docker pull {{ .REPO }}:{{ .VERSION }}
- ssh rosti-node-23 docker tag {{ .REPO }}:{{ .VERSION }} {{ .REPO_PUBLIC }}:{{ .VERSION }} - ssh rosti-node-26 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: publish:
cmds: cmds:
- ssh rosti-node-25 docker push {{ .REPO_PUBLIC }}:{{ .VERSION }} - ssh rosti-node-26 docker push {{ .REPO_PUBLIC }}:{{ .VERSION }}

View file

@ -71,6 +71,7 @@ cd -
echo "no" | /opt/techs/php-$VERSION/bin/pecl install redis echo "no" | /opt/techs/php-$VERSION/bin/pecl install redis
echo "no" | /opt/techs/php-$VERSION/bin/pecl install mongodb echo "no" | /opt/techs/php-$VERSION/bin/pecl install mongodb
echo "no" | /opt/techs/php-$VERSION/bin/pecl install sqlsrv
export PATH=$PATH:/opt/techs/php-$VERSION/bin export PATH=$PATH:/opt/techs/php-$VERSION/bin
composer.phar require ext-simplexml composer.phar require ext-simplexml
@ -78,6 +79,7 @@ composer.phar require ext-simplexml
echo "zend_extension=opcache.so" > /opt/techs/php-$VERSION/etc/conf.d/extensions.ini echo "zend_extension=opcache.so" > /opt/techs/php-$VERSION/etc/conf.d/extensions.ini
echo "extension=redis.so" >> /opt/techs/php-$VERSION/etc/conf.d/extensions.ini echo "extension=redis.so" >> /opt/techs/php-$VERSION/etc/conf.d/extensions.ini
echo "extension=mongodb.so" >> /opt/techs/php-$VERSION/etc/conf.d/extensions.ini echo "extension=mongodb.so" >> /opt/techs/php-$VERSION/etc/conf.d/extensions.ini
echo "extension=sqlsrv.so" >> /opt/techs/php-$VERSION/etc/conf.d/extensions.ini
# Not supported yet # Not supported yet
# https://github.com/Imagick/imagick/issues/358 # https://github.com/Imagick/imagick/issues/358

View file

@ -3,14 +3,14 @@
. ~/.bashrc . ~/.bashrc
# DEFAULT VERSIONS # DEFAULT VERSIONS
VERSION_PYTHON="3.13.0" VERSION_NODE="23.6.0"
VERSION_PHP="8.4.1" VERSION_PYTHON="3.13.1"
VERSION_NODE="23.3.0" VERSION_PHP="8.4.3"
VERSION_RUBY="3.3.6" VERSION_RUBY="3.4.1"
VERSION_DENO="2.1.1" VERSION_DENO="2.1.6"
VERSION_BUN="1.1.36" VERSION_BUN="1.1.45"
VERSION_OPENJDK="23.0.1" VERSION_OPENJDK="23.0.1"
VERSION_GOLANG="1.23.3" VERSION_GOLANG="1.23.5"
WIDTH=180 WIDTH=180
HEIGHT=25 HEIGHT=25
@ -54,6 +54,15 @@ function setTech() {
if [ -e /srv/app/supervisor.conf ]; then if [ -e /srv/app/supervisor.conf ]; then
mv /srv/app/supervisor.conf /srv/conf/supervisor.d/$name.conf mv /srv/app/supervisor.conf /srv/conf/supervisor.d/$name.conf
fi fi
# Ruby initialization specifics
if [ "$name" = "ruby" ]; then
mkdir -p /srv/app/public
rm /srv/conf/nginx.d/app.conf
mv /srv/app/index.html /srv/app/public/index.html
rm -rf /srv/conf/nginx.d
rm -f /srv/conf/supervisor.d/nginx.conf
fi
else else
echo "IMPORTANT: /srv/app found so no configuration or files are copied, make sure the application is ok after this process" echo "IMPORTANT: /srv/app found so no configuration or files are copied, make sure the application is ok after this process"
fi fi
@ -112,14 +121,6 @@ function setTech() {
echo ".. app configuration for nginx not found, adding it - please check /srv/conf/nginx.d/app.conf and make sure it fits your code" echo ".. app configuration for nginx not found, adding it - please check /srv/conf/nginx.d/app.conf and make sure it fits your code"
fi fi
if [ "$name" = "ruby" ]; then
mkdir -p /srv/app/public
rm /srv/conf/nginx.d/app.conf
mv /srv/app/index.html /srv/app/public/index.html
rm -rf /srv/conf/nginx.d
rm -f /srv/conf/supervisor.d/nginx.conf
fi
# We load new configuration into supervisor and it's automatically started or restarted if needed # We load new configuration into supervisor and it's automatically started or restarted if needed
supervisorctl reread supervisorctl reread
supervisorctl update supervisorctl update