Fix redis config

.drone.yml

@@ -4,7 +4,7 @@ name: image building
 
 steps:
 - name: build&push squashed image
-  image: harbor.hq.rosti.cz/library/builder:39
+  image: harbor.hq.rosti.cz/library/builder:38
   environment:
     username: robot$rosti+rosti
     password: 
@@ -29,7 +29,7 @@ name: test image
 
 steps:
 - name: test build
-  image: harbor.hq.rosti.cz/library/builder:39
+  image: harbor.hq.rosti.cz/library/builder:38
   environment:
     username: robot$rosti+rosti
     password: 

.github/workflows/test.yml

@@ -1,19 +0,0 @@
-name: Test build
-
-on:
-  push:
-    branches: [ main ]
-
-jobs:
-  build:
-    runs-on: [moon, amd64]
-    steps:
-      - uses: actions/checkout@v4
-      - name: Test build
-        run: |
-          # echo "${{ secrets.repo_password }}" | podman login -u $USERNAME --password-stdin $REPO
-          docker login gitea.ceperka.net -u "${{ secrets.REPO_USERNAME }}" -p "${{ secrets.REPO_PASSWORD }}"
-          task pipeline REPO=gitea.ceperka.net/rosti/runtime VERSION=pipeline
-
-
-

.github/workflows/tests.yml

@@ -0,0 +1,14 @@
+name: Image testing
+
+on: 
+- push
+
+jobs:
+  tests:
+   runs-on: ubuntu-latest
+   steps:
+   - uses: actions/checkout@v1
+   - name: testing
+     run: |
+       make build
+       make test

Dockerfile

@@ -1,12 +1,12 @@
-FROM debian:bookworm
+FROM debian:bullseye
 
 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/ bookworm main contrib non-free" > /etc/apt/sources.list && \
+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 bookworm-security main" >> /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/ bookworm-updates main contrib non-free" >> /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 \
@@ -14,19 +14,14 @@ 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-15 postgresql-15-postgis-3-scripts bind9-host dnsutils nginx nginx-extras libnginx-mod-http-image-filter \
+mariadb-client postgresql-client-13 postgresql-13-postgis-3-scripts bind9-host dnsutils nginx nginx-extras libnginx-mod-http-image-filter \
 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 \
-libcurl4-openssl-dev python3-dev libproj-dev gdal-bin libmemcached-dev swig mutt \
+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 jq inotify-tools ripgrep \
+jpegoptim optipng pngquant gifsicle webp libvpx-dev libwebp-dev jq inotify-tools ripgrep
-wkhtmltopdf libzbar0 fzf
-
-# 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 install -y chromium
 
 WORKDIR /srv
 
@@ -47,66 +42,40 @@ ENV TERM       xterm
 #############
 
 ## Node.js
-# From https://nodejs.org/en/about/previous-releases
 WORKDIR /usr/src
 ADD build_node.sh /usr/local/bin/build_node.sh
-RUN build_node.sh 18.20.4
+# 2023/08
-RUN build_node.sh 20.18.0
+RUN build_node.sh 16.20.2
-RUN build_node.sh 21.7.3
+RUN build_node.sh 17.9.1
-RUN build_node.sh 22.9.0
+RUN build_node.sh 19.9.0
+RUN build_node.sh 18.17.1
+RUN build_node.sh 20.6.1
 
 ## Python
-# https://www.python.org/downloads/
 WORKDIR /usr/src
 ADD build_python.sh /usr/local/bin/build_python.sh
-RUN build_python.sh 3.11.10
+# 2023/08
-RUN build_python.sh 3.12.7
+RUN build_python.sh 3.11.5
-RUN build_python.sh 3.13.0
+
+## PHP 7
+ADD build_php.sh /usr/local/bin/build_php.sh
+RUN build_php.sh 7.4.33
 
 ## 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
+# 2023/08
-RUN build_php8.sh 8.3.12
+RUN build_php8.sh 8.2.9
 
 ## 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
+# 2023/08
-RUN build_ruby.sh 3.3.5
+RUN build_ruby.sh 3.2.2
 
 ## 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
+# 2023/08
-
+RUN build_deno.sh 1.36.4
-# Bun
-# From here: https://bun.sh/
-ADD build_bun.sh /usr/local/bin/build_bun.sh
-RUN build_bun.sh 1.1.29
-
-# 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
-
-# Golang
-# From here: https://go.dev/dl/
-ADD build_golang.sh /usr/local/bin/build_golang.sh
-RUN build_golang.sh 1.23.2
-
-
-#############
-
-# WKHTMLTOX This is not in development anymore so we will remove it with next version of Debian
-
-WORKDIR /usr/src
-RUN apt install -f xfonts-75dpi && \
-      wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb && \
-      dpkg -i wkhtmltox_0.12.6.1-3.bookworm_amd64.deb && \
-      rm wkhtmltox_0.12.6.1-3.bookworm_amd64.deb
 
 #############
 
@@ -147,10 +116,6 @@ ADD ./rosti.tmpl.sh /usr/src/
 ADD ./Dockerfile /usr/src/
 RUN cd /usr/src && /usr/local/bin/gen_rosti.fish > /usr/local/bin/rosti && chmod 755 /usr/local/bin/rosti
 
-## Rosti tooling
-
-ADD ./activate_tech.fish /usr/local/bin/activate_tech
-
 ## Cleaning
 RUN apt-get clean && rm -rf /usr/src/*
 

Makefile

@@ -1,8 +1,8 @@
 # TODO: Unnecessary, remo this file
 REPO=harbor.hq.rosti.cz/rosti/runtime
 DOCKER=docker
-VERSION=2023.12-1
+VERSION=2023.08-1
-BASEIMAGE=debian:12
+BASEIMAGE=debian:11
 
 all: build
 

Taskfile.yml

@@ -4,7 +4,7 @@ version: '3'
 
 vars:
   REPO: harbor.hq.rosti.cz/rosti/runtime
-  VERSION: 2024.10-1
+  VERSION: 2023.04-2
   BASEIMAGE: debian:bookworm
 
 tasks:
@@ -12,12 +12,6 @@ tasks:
     deps:
     - build
   
-  pipeline:
-    cmds:
-    - task: build
-    - task: test
-    - task: push
-
   build:
     cmds:
     - docker pull {{ .BASEIMAGE }}
@@ -41,5 +35,3 @@ tasks:
   push:
     cmds:
     - docker push {{ .REPO }}:{{ .VERSION }}
-    # deps:
-    # - squashed

activate_tech.fish

@@ -1,24 +0,0 @@
-#!/usr/bin/fish
-
-for techline in (ls /opt/techs | fzf --layout reverse)
-    set tech (echo $techline | string split -f 1 - )
-    set ver (echo $techline | string split -f 2 - )
-
-    test -e /srv/bin/active_$tech && unlink /srv/bin/active_$tech
-
-    set primary_tech (readlink /srv/bin/primary_tech | string split -f 4 / | string split -f 1 "-")
-    if test $primary_tech = $tech
-        set_color -b red
-        echo "Technology $tech is already activated as primary tech, you can't activate it as secondary."
-        set_color normal
-        continue
-    end
-
-    set_color yellow
-    echo "Activating $tech-$ver"
-    set_color normal
-    ln -s /opt/techs/$tech-$ver/bin /srv/bin/active_$tech
-    set_color green
-    echo "Done."
-    set_color normal
-end

build_bun.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p /opt/techs
-
-VERSION=$1
-
-cd /usr/src
-
-
-wget https://github.com/oven-sh/bun/releases/download/bun-v$VERSION/bun-linux-x64.zip
-unzip bun-linux-x64.zip
-mkdir -p /opt/techs/bun-$VERSION
-mv bun-linux-x64 /opt/techs/bun-$VERSION/bin
-rm bun-linux-x64.zip

build_golang.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p /opt/techs
-
-VERSION=$1
-HASH=$2
-
-cd /usr/src
-
-wget https://go.dev/dl/go${VERSION}.linux-amd64.tar.gz
-tar xf go${VERSION}.linux-amd64.tar.gz
-mv go /opt/techs/golang-$VERSION
-rm go${VERSION}.linux-amd64.tar.gz

build_openjdk.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p /opt/techs
-
-VERSION=$1
-HASH=$2
-NUM=$3
-
-cd /usr/src
-
-wget https://download.java.net/java/GA/jdk${VERSION}/${HASH}/${NUM}/GPL/openjdk-${VERSION}_linux-x64_bin.tar.gz
-tar xf openjdk-${VERSION}_linux-x64_bin.tar.gz
-mv jdk-${VERSION} /opt/techs/openjdk-$VERSION
-rm openjdk-${VERSION}_linux-x64_bin.tar.gz

build_php.sh

@@ -78,6 +78,7 @@ cd -
 
 echo "no" | /opt/techs/php-$VERSION/bin/pecl install redis
 echo "no" | /opt/techs/php-$VERSION/bin/pecl install imagick
+echo "no" | /opt/techs/php-$VERSION/bin/pecl install memcached
 
 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

build_php8.sh

@@ -4,7 +4,6 @@ set -e
 
 VERSION=$1
 
-
 mkdir -p /opt/techs
 
 cd /usr/src
@@ -72,20 +71,12 @@ cd -
 echo "no" | /opt/techs/php-$VERSION/bin/pecl install redis
 echo "no" | /opt/techs/php-$VERSION/bin/pecl install mongodb
 
-export PATH=$PATH:/opt/techs/php-$VERSION/bin
-composer.phar require ext-simplexml
-
 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=mongodb.so" >> /opt/techs/php-$VERSION/etc/conf.d/extensions.ini
-
 # Not supported yet
 # https://github.com/Imagick/imagick/issues/358
-# We ignore PHP 8.3.2 until it's fixed
-if [ "$VERSION" != "8.3.2" -a "$VERSION" != "8.3.6" -a "$VERSION" != "8.3.9" -a "$VERSION" != "8.3.12" ]; then
 echo "no" | /opt/techs/php-$VERSION/bin/pecl install imagick
 echo "extension=imagick.so" >> /opt/techs/php-$VERSION/etc/conf.d/extensions.ini
-fi
-
 
 ln -s /srv/conf/php-fpm/php.ini /opt/techs/php-$VERSION/etc/conf.d/99-app.ini

build_ruby.sh

@@ -18,10 +18,3 @@ cd ruby-$VERSION
 ./configure --prefix=/opt/techs/ruby-$VERSION
 make -j
 make install
-
-/opt/techs/ruby-${VERSION}/bin/gem update --system
-/opt/techs/ruby-${VERSION}/bin/gem install passenger
-
-git clone --depth 1 https://github.com/rbenv/rbenv.git /opt/techs/ruby-$VERSION/rbenv
-ln -s /opt/techs/ruby-$VERSION/rbenv/libexec/rbenv /opt/techs/ruby-$VERSION/bin/rbenv
-

etc/bashrc_local

@@ -1,16 +1,4 @@
 export PATH=/srv/bin/primary_tech:/srv/bin/primary_tech/sbin:/srv/bin:$PATH:/usr/sbin:/sbin
-export PATH=$PATH:/srv/bin/active_bun
-export PATH=$PATH:/srv/bin/active_deno
-export PATH=$PATH:/srv/bin/active_golang
-export PATH=$PATH:/srv/bin/active_node
-export PATH=$PATH:/srv/bin/active_openjdk
-export PATH=$PATH:/srv/bin/active_php
-export PATH=$PATH:/srv/bin/active_python
-export PATH=$PATH:/srv/bin/active_ruby
-
-# Ruby related variables
-export BUNDLE_PATH=/srv/tmp/cache
-export GEM_HOME=/srv/.gem
 
 # Use only if the shell is opened via SSH
 if [ -n "$SSH_TTY" ]; then

examples/bun/package.json

@@ -1,9 +0,0 @@
-{
-    "name": "welcome",
-    "version": "0.1.0",
-    "description": "Welcome page by Roští.cz",
-    "author": "Adam Štrauch <cx@initd.cz>",
-    "scripts": {
-      "start": "/srv/bin/primary_tech/bun run app.js"
-    }
-  }

examples/bun/supervisor.conf

@@ -1,14 +0,0 @@
-[program:app]
-command=/srv/bin/primary_tech/bun run start
-environment=PATH="/srv/bin/primary_tech:/usr/local/bin:/usr/bin:/bin:/srv/.npm-packages/bin"
-stopasgroup=true
-directory=/srv/app
-process_name=app
-autostart=true
-autorestart=true
-stdout_logfile=/srv/log/bun.log
-stdout_logfile_maxbytes=2MB
-stdout_logfile_backups=5
-stdout_capture_maxbytes=2MB
-stdout_events_enabled=false
-redirect_stderr=true

examples/default/index.html

@@ -50,7 +50,7 @@
                 <p>Nyní je nutné přihlásit se do kontejneru s vaší aplikací přes SSH a použít příkaz <em>rosti</em> k základnímu nastavení prostředí. Přístupy najdete v naší administraci v info kartě aplikace.</p>
             </div>
             <p>V případě problémů se prosím obraťte na <a href="mailto:podpora@rosti.cz">technickou podporu</a> nebo na <a href="https://docs.rosti.cz/" target="_blank">dokumentaci</a>.</p>
-            <p>Tým <a href="https://rosti.cz">Roští.cz</a> | <a href="https://rosti.social/@we">@we@rosti.social</a></p>
+            <p>Tým <a href="https://rosti.cz">Roští.cz</a> | <a href="http://twitter.com/rosti_cz">@rosti_cz</a></p>
         </div>
     </div>
     <script type="application/javascript">

examples/deno/app.js

@@ -55,7 +55,7 @@ for await (const request of server) {
                    <p>HTTP server vaší aplikace spusťte na portu <code>8080</code>. Na jiném nebude fungovat.</p>
               </div>
               <p>V případě problémů se prosím obraťte na <a href=\"mailto:podpora@rosti.cz\">technickou podporu</a> nebo na <a href=\"https://docs.rosti.cz/\" target=\"_blank\">dokumentaci</a>.</p>
-              <p>Tým <a href=\"https://rosti.cz\">Roští.cz</a> | <a href=\"https://rosti.social/@we\">@we@rosti.social</a></p>
+              <p>Tým <a href=\"https://rosti.cz\">Roští.cz</a> | <a href=\"http://twitter.com/rosti_cz\">@rosti_cz</a></p>
           </div>
       </div>
       <script type=\"application/javascript\">

examples/golang/supervisor.conf

@@ -1,14 +0,0 @@
-[program:app]
-command=/srv/app/example_app
-environment=PATH="/srv/bin/primary_tech:/usr/local/bin:/usr/bin:/bin:/srv/.npm-packages/bin"
-stopasgroup=true
-directory=/srv/app
-process_name=app
-autostart=true
-autorestart=true
-stdout_logfile=/srv/log/golang.log
-stdout_logfile_maxbytes=2MB
-stdout_logfile_backups=5
-stdout_capture_maxbytes=2MB
-stdout_events_enabled=false
-redirect_stderr=true

examples/node/Dockerfile

@@ -1,158 +0,0 @@
-FROM debian:bookworm
-
-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/ bookworm main contrib non-free" > /etc/apt/sources.list && \
-    echo "deb http://security.debian.org/debian-security bookworm-security main" >> /etc/apt/sources.list && \
-    echo "deb http://deb.debian.org/debian/ bookworm-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 \
-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-15 postgresql-15-postgis-3-scripts bind9-host dnsutils nginx nginx-extras libnginx-mod-http-image-filter \
-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 \
-libcurl4-openssl-dev python3-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 jq inotify-tools ripgrep \
-wkhtmltopdf libzbar0
-
-# 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 install -y chromium
-
-WORKDIR /srv
-
-RUN useradd -d /srv app -s /bin/bash
-RUN usermod -G crontab -a app
-RUN rm /etc/localtime
-RUN ln -s /usr/share/zoneinfo/Europe/Prague /etc/localtime
-
-ADD /etc/locale.gen /etc/
-RUN locale-gen
-ENV LANG       en_US.UTF-8
-ENV LC_ALL     en_US.UTF-8
-
-ENV TERM       xterm
-
-#############
-# Techs
-#############
-
-## Node.js
-# https://nodejs.org/en/about/previous-releases
-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.15.1
-RUN build_node.sh 21.7.3
-RUN build_node.sh 22.4.1
-
-## Python
-# https://www.python.org/downloads/
-WORKDIR /usr/src
-ADD build_python.sh /usr/local/bin/build_python.sh
-RUN build_python.sh 3.11.9
-RUN build_python.sh 3.12.4
-
-## PHP 8
-# https://www.php.net/downloads.php
-ADD build_php8.sh /usr/local/bin/build_php8.sh
-RUN build_php8.sh 8.2.15
-RUN build_php8.sh 8.2.21
-RUN build_php8.sh 8.3.6
-RUN build_php8.sh 8.3.9
-
-## 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.2
-RUN build_ruby.sh 3.3.1
-
-## Deno
-ADD build_deno.sh /usr/local/bin/build_deno.sh
-# 2024/05
-RUN build_deno.sh 1.43.6 
-RUN build_deno.sh 1.45.1
-
-# Bun
-ADD build_bun.sh /usr/local/bin/build_bun.sh
-RUN build_bun.sh 1.1.18
-
-# 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
-
-# Golang
-# From here: https://go.dev/dl/
-ADD build_golang.sh /usr/local/bin/build_golang.sh
-RUN build_golang.sh 1.22.5
-
-
-#############
-
-# WKHTMLTOX This is not in development anymore so we will remove it with next version of Debian
-
-WORKDIR /usr/src
-RUN apt install -f xfonts-75dpi && \
-      wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb && \
-      dpkg -i wkhtmltox_0.12.6.1-3.bookworm_amd64.deb && \
-      rm wkhtmltox_0.12.6.1-3.bookworm_amd64.deb
-
-#############
-
-## Support tools and miscellaneous stuff
-
-RUN rm -f /etc/cron.d/* /etc/cron.daily/* /etc/cron.hourly/* /etc/cron.monthly/* /etc/cron.weekly/*
-
-ADD /scripts/enable_redis.sh /usr/local/bin/enable-redis
-ADD /scripts/enable_memcached.sh /usr/local/bin/enable-memcached
-RUN chmod 755 /usr/local/bin/*
-
-ADD /etc/supervisord.conf /etc/supervisor/supervisord.conf
-ADD /examples /opt/examples
-ADD /etc/bashrc_local /opt/etc/bashrc_local
-ADD /etc/bash_profile /opt/etc/bash_profile
-ADD /etc/vimrc /opt/etc/vimrc
-RUN mkdir -p /opt/etc/bashrc
-RUN mkdir -p /opt/etc/appinit
-ADD /etc/bashrc/common.sh /opt/etc/bashrc/
-ADD /etc/nginx.conf /etc/nginx/nginx.conf
-
-RUN rmdir /var/lib/nginx
-RUN ln -s /srv/var/nginx /var/lib/nginx
-RUN chown app:app /var/log/nginx -R
-
-RUN chown app:app /home -R
-
-# Start script
-
-ADD /start.sh /start.sh
-RUN chmod 755 /start.sh
-
-## Roští script
-
-RUN apt-get install -y fish
-ADD ./gen_rosti.fish /usr/local/bin/
-ADD ./rosti.tmpl.sh /usr/src/
-ADD ./Dockerfile /usr/src/
-RUN cd /usr/src && /usr/local/bin/gen_rosti.fish > /usr/local/bin/rosti && chmod 755 /usr/local/bin/rosti
-
-## Cleaning
-RUN apt-get clean && rm -rf /usr/src/*
-
-
-VOLUME /srv
-WORKDIR /srv
-EXPOSE 8000 22
-
-ENTRYPOINT ["/start.sh"]

examples/node/app.js

@@ -58,7 +58,7 @@ var server = http.createServer(function (request, response) {
                  <p>HTTP server vaší aplikace spusťte na portu <code>8080</code>. Na jiném nebude fungovat. Původní port 8000 nyní patří Nginxu, za kterým je vaše aplikace schovaná.</p>
             </div>
             <p>V případě problémů se prosím obraťte na <a href=\"mailto:podpora@rosti.cz\">technickou podporu</a> nebo na <a href=\"https://docs.rosti.cz/\" target=\"_blank\">dokumentaci</a>.</p>
-            <p>Tým <a href=\"https://rosti.cz\">Roští.cz</a> | <a href=\"https://rosti.social/@we\">@we@rosti.social</a></p>
+            <p>Tým <a href=\"https://rosti.cz\">Roští.cz</a> | <a href=\"http://twitter.com/rosti_cz\">@rosti_cz</a></p>
         </div>
     </div>
     <script type=\"application/javascript\">

examples/openjdk/supervisor.conf

@@ -1,14 +0,0 @@
-[program:app]
-command=/srv/bin/primary_tech/java /srv/app/app.java
-environment=PATH="/srv/bin/primary_tech:/usr/local/bin:/usr/bin:/bin:/srv/.npm-packages/bin"
-stopasgroup=true
-directory=/srv/app
-process_name=app
-autostart=true
-autorestart=true
-stdout_logfile=/srv/log/openjdk.log
-stdout_logfile_maxbytes=2MB
-stdout_logfile_backups=5
-stdout_capture_maxbytes=2MB
-stdout_events_enabled=false
-redirect_stderr=true

examples/php/index.php

@@ -49,7 +49,7 @@
                 </p>
             </div>
             <p>V případě problémů se prosím obraťte na <a href="mailto:podpora@rosti.cz">technickou podporu</a> nebo na <a href="https://docs.rosti.cz/" target="_blank">dokumentaci</a>.</p>
-            <p>Tým <a href="https://rosti.cz">Roští.cz</a> | <a href="https://rosti.social/@we">@we@rosti.social</a></p>
+            <p>Tým <a href="https://rosti.cz">Roští.cz</a> | <a href="http://twitter.com/rosti_cz">@rosti_cz</a></p>
         </div>
     </div>
     <script type="application/javascript">

examples/python/app.py

@@ -71,7 +71,7 @@ application = get_wsgi_application()
                 <p>Do souboru <code>/srv/app/init.sh</code> můžete napsat příkazy, které se mají spustit po každém restart kontejneru. Můžete si tak usnadnit třeba deployment.</p>
             </div>
             <p>V případě problémů se prosím obraťte na <a href="mailto:podpora@rosti.cz">technickou podporu</a> nebo na <a href="https://docs.rosti.cz/" target="_blank">dokumentaci</a>.</p>
-            <p>Tým <a href="https://rosti.cz">Roští.cz</a> | <a href="https://rosti.social/@we">@we@rosti.social</a></p>
+            <p>Tým <a href="https://rosti.cz">Roští.cz</a> | <a href="http://twitter.com/rosti_cz">@rosti_cz</a></p>
         </div>
     </div>
     <script type="application/javascript">

examples/ruby/supervisor.conf

@@ -1,6 +1,6 @@
 [program:app]
-command=/srv/bin/primary_tech/passenger start --port 8000 --pid-file /srv/run/passenger.pid
+command=/srv/bin/primary_tech/ruby app.rb
-environment=PATH="/srv/bin/primary_tech:/usr/local/bin:/usr/bin:/bin:/srv/.npm-packages/bin",GEM_HOME=/srv/.gem,BUNDLE_PATH=/srv/tmp/cache
+environment=PATH="/srv/bin/primary_tech:/usr/local/bin:/usr/bin:/bin:/srv/.npm-packages/bin"
 stopasgroup=true
 directory=/srv/app
 process_name=app

gen_rosti.fish

@@ -27,15 +27,6 @@ for line in (cat Dockerfile | grep "RUN build_")
     case "build_deno.sh"
         set TECH deno
         set TECH_VERBOSE Deno
-    case "build_bun.sh"
-        set TECH bun
-        set TECH_VERBOSE Bun
-    case "build_golang.sh"
-        set TECH golang
-        set TECH_VERBOSE Golang
-    case "build_openjdk.sh"
-        set TECH openjdk
-        set TECH_VERBOSE OpenJDK
     case '*'
         set TECH unknown
     end

generate_versions.py

@@ -32,7 +32,7 @@ with open("Dockerfile") as f:
             output["techs"][name]["versions"].append(version)
 
 # os.system(f"docker pull {image}")
-system_version = subprocess.check_output(f"docker run --rm {image} cat /etc/debian_version", shell=True)
+system_version = subprocess.check_output(f"podman run --rm {image} cat /etc/debian_version", shell=True)
 output["system"]["version"] = system_version.strip().decode()
 
 print(json.dumps(output, indent=4))

rosti.tmpl.sh

@@ -3,14 +3,11 @@
 . ~/.bashrc
 
 # DEFAULT VERSIONS
-VERSION_PYTHON="3.13.0"
+VERSION_PYTHON="3.11.5"
-VERSION_PHP="8.3.12"
+VERSION_PHP="8.2.9"
-VERSION_NODE="22.9.0"
+VERSION_NODE="20.6.1"
-VERSION_RUBY="3.3.5"
+VERSION_RUBY="3.2.2"
-VERSION_DENO="1.46.3"
+VERSION_DENO="1.36.4"
-VERSION_BUN="1.1.29"
-VERSION_OPENJDK="23"
-VERSION_GOLANG="1.23.2"
 
 WIDTH=180
 HEIGHT=25
@@ -18,7 +15,7 @@ HEIGHT=25
 TECHDIR=/opt/techs
 PRIMARYDIR=/srv/bin/primary_tech
 
-# Usage: rosti php|python|node|bun|memcached|redis OPTINAL_VERSION
+# Usage: rosti php|python|node|memcached|redis OPTINAL_VERSION
 #
 # This script helps to configure the environment for selected
 # language/technology/service. The language or service can be
@@ -87,6 +84,7 @@ function setTech() {
         test ! -e /srv/conf/php-fpm/php.ini && ln -s /srv/conf/php-fpm/php.ini /opt/techs/$tech/etc/conf.d/app.ini
 
         # And remove unneeded ones
+        # TODO: not sure how good idea this is
         rm -f /srv/app/php-fpm.conf /srv/app/pool_app.conf /srv/app/php.ini
     fi
 
@@ -102,7 +100,7 @@ function setTech() {
     # Same thing we do for nginx but if the file exist it's not rewritten.
     # Except if the file is in /srv/app, then it's moved to /srv/conf/nginx.d
     if [ ! -e /srv/conf/nginx.d/app.conf -o -e /srv/app/nginx.conf ]; then
-        mkdir -p /srv/conf/nginx.d;
+        mkdir -p /srv/conf/nginx.d
         if [ -e /srv/app/nginx.conf ]; then
             mv /srv/app/nginx.conf /srv/conf/nginx.d/app.conf
         else
@@ -112,14 +110,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"
     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
     supervisorctl reread
     supervisorctl update
@@ -212,24 +202,6 @@ function quickTech() {
             fi
             setTech $TECH-$VERSION
         ;;
-        "bun")
-            if [ -z "$VERSION" ]; then
-                VERSION=$VERSION_BUN
-            fi
-            setTech $TECH-$VERSION
-        ;;
-        "openjdk")
-            if [ -z "$VERSION" ]; then
-                VERSION=$VERSION_OPENJDK
-            fi
-            setTech $TECH-$VERSION
-        ;;
-        "golang")
-            if [ -z "$VERSION" ]; then
-                VERSION=$VERSION_GOLANG
-            fi
-            setTech $TECH-$VERSION
-        ;;
         "memcached")
             setService $TECH
         ;;

start.sh

@@ -63,11 +63,7 @@ if [ ! -e /srv/.vimrc ]; then
 fi
 
 # Crontab
-if [ ! -e /srv/conf/crontab ]; then
+test ! -e /srv/conf/crontab && touch /srv/conf/crontab
-    echo 'PATH=/srv/bin/primary_tech:/srv/bin/primary_tech/sbin:/srv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/bin:/sbin:/srv/bin/primary_tech:/srv/bin/primary_tech/sbin:/srv/bin:/srv/bin/active_bun:/srv/bin/active_deno:/srv/bin/active_golang:/srv/bin/active_node:/srv/bin/active_openjdk:/srv/bin/active_php:/srv/bin/active_python:/srv/bin/active_ruby' > /srv/conf/crontab
-    echo "" >> /srv/conf/crontab
-    echo "" >> /srv/conf/crontab
-fi
 if [ -e  /srv/conf/crontab ]; then
     crontab -u app /srv/conf/crontab
 fi

tests2.sh

@@ -24,10 +24,10 @@ fi
 CONTAINER_NAME=dev_test
 $DOCKER stop $CONTAINER_NAME &>/dev/null
 
-COUNT=`cat Dockerfile | grep -e "^RUN build_" | sed "s/RUN build_//" | sed "s/\.sh//" | sed "s/php8/php/" | wc -l`
+COUNT=`cat Dockerfile | grep "RUN build_" | sed "s/RUN build_//" | sed "s/\.sh//" | sed "s/php8/php/" | wc -l`
 I=1
 
-cat Dockerfile | grep -e "^RUN build_" | sed "s/RUN build_//" | sed "s/\.sh//" | sed "s/php8/php/" | \
+cat Dockerfile | grep "RUN build_" | sed "s/RUN build_//" | sed "s/\.sh//" | sed "s/php8/php/" | \
 while read line
 do
     tech=`echo $line | cut -d " " -f 1`
@@ -53,7 +53,6 @@ do
 
     echo -e "${BRed}.. ${Yel}cleaning this round${RCol}"
     $DOCKER stop $CONTAINER_NAME &>/dev/null || exit 1
-    sleep 1
 
     ((I++))