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,29 +0,0 @@
-name: Test build
-
-on:
-  push:
-    branches: [ main ]
-
-jobs:
-  build:
-    runs-on: [moon, amd64]
-    container:
-      image: harbor.hq.rosti.cz/library/builder:38
-      env:
-        REPO: harbor.hq.rosti.cz
-        USERNAME: robot$rosti+rosti
-    #   ports:
-    #     - 80
-    #   volumes:
-    #     - my_docker_volume:/volume_mount
-    #   options: --cpus 1
-    steps:
-      - uses: actions/checkout@v4
-      - name: Test build
-        run: |
-          echo "${{ secrets.repo_password }}" | podman login -u $USERNAME --password-stdin $REPO
-        #   task build
-        #   task test
-
-
-

.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,4 +1,4 @@
-FROM debian:bookworm
+FROM debian:bullseye
 
 RUN DEBIAN_FRONTEND=noninteractive apt-get update
 RUN DEBIAN_FRONTEND=noninteractive apt-get upgrade -y
@@ -45,42 +45,37 @@ ENV TERM       xterm
 WORKDIR /usr/src
 ADD build_node.sh /usr/local/bin/build_node.sh
 # 2023/08
+RUN build_node.sh 16.20.2
+RUN build_node.sh 17.9.1
 RUN build_node.sh 19.9.0
 RUN build_node.sh 18.17.1
-RUN build_node.sh 20.5.1
-RUN build_node.sh 20.9.0
-RUN build_node.sh 21.2.0
+RUN build_node.sh 20.6.1
 
 ## Python
 WORKDIR /usr/src
 ADD build_python.sh /usr/local/bin/build_python.sh
 # 2023/08
-RUN build_python.sh 3.10.12
-RUN build_python.sh 3.10.13
-RUN build_python.sh 3.11.4
-RUN build_python.sh 3.11.6
-RUN build_python.sh 3.12.0
+RUN build_python.sh 3.11.5
+
+## PHP 7
+ADD build_php.sh /usr/local/bin/build_php.sh
+RUN build_php.sh 7.4.33
 
 ## PHP 8
 ADD build_php8.sh /usr/local/bin/build_php8.sh
 # 2023/08
-RUN build_php8.sh 8.1.21
-RUN build_php8.sh 8.1.25
-RUN build_php8.sh 8.2.7
-RUN build_php8.sh 8.2.12
+RUN build_php8.sh 8.2.9
 
 ## Ruby
 WORKDIR /usr/src
 ADD build_ruby.sh /usr/local/bin/build_ruby.sh
 # 2023/08
-RUN build_ruby.sh 3.1.4
 RUN build_ruby.sh 3.2.2
 
 ## Deno
 ADD build_deno.sh /usr/local/bin/build_deno.sh
 # 2023/08
-RUN build_deno.sh 1.36.1
-RUN build_deno.sh 1.38.2
+RUN build_deno.sh 1.36.4
 
 #############
 

Makefile

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

Taskfile.yml

@@ -4,7 +4,7 @@ version: '3'
 
 vars:
   REPO: harbor.hq.rosti.cz/rosti/runtime
-  VERSION: 2023.12-1
+  VERSION: 2023.04-2
   BASEIMAGE: debian:bookworm
 
 tasks:
@@ -35,5 +35,3 @@ tasks:
   push:
     cmds:
     - docker push {{ .REPO }}:{{ .VERSION }}
-    deps:
-    - squashed

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_ruby.sh

@@ -18,6 +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

examples/ruby/supervisor.conf

@@ -1,5 +1,5 @@
 [program:app]
-command=passenger start --port 8000 --log-file /dev/stdout --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"
 stopasgroup=true
 directory=/srv/app

rosti.tmpl.sh

@@ -3,11 +3,11 @@
 . ~/.bashrc
 
 # DEFAULT VERSIONS
-VERSION_PYTHON="3.12.0"
-VERSION_PHP="8.2.12"
-VERSION_NODE="20.9.0"
+VERSION_PYTHON="3.11.5"
+VERSION_PHP="8.2.9"
+VERSION_NODE="20.6.1"
 VERSION_RUBY="3.2.2"
-VERSION_DENO="1.38.2"
+VERSION_DENO="1.36.4"
 
 WIDTH=180
 HEIGHT=25
@@ -110,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