From 3cc973636a7205f69038e2a698821cc1ec93a82c Mon Sep 17 00:00:00 2001 From: Ivan Stana <^_^@myrtana.sk> Date: Mon, 16 Sep 2024 00:21:09 +0200 Subject: [PATCH 1/4] Update Debian in Vagrantfile --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index a0146c3..6480c77 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,7 +13,7 @@ Vagrant.configure("2") do |config| # Every Vagrant development environment requires a box. You can search for # boxes at https://vagrantcloud.com/search. #config.vm.box = "base" - config.vm.box = "generic/debian10" + config.vm.box = "generic/debian12" # Disable automatic box update checking. If you disable this, then # boxes will only be checked for updates when the user runs From 78ebca4a801c5b5a689003fb89cd78bf9aa6876f Mon Sep 17 00:00:00 2001 From: Ivan Stana <^_^@myrtana.sk> Date: Mon, 16 Sep 2024 00:22:57 +0200 Subject: [PATCH 2/4] Update Debian in Docker --- docker-compose.yml | 1 - docker/Dockerfile.debian | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3a49f39..f5176bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: sys: build: diff --git a/docker/Dockerfile.debian b/docker/Dockerfile.debian index 9899188..ae0dcb3 100644 --- a/docker/Dockerfile.debian +++ b/docker/Dockerfile.debian @@ -1,4 +1,4 @@ -FROM debian:bullseye +FROM debian:bookworm ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update RUN apt-get install -y build-essential cmake libmariadb-dev libconfig-dev syslog-ng-dev bats \ From fcee20ee9f6d72c48616aba9ffe39480042c6d2a Mon Sep 17 00:00:00 2001 From: Ivan Stana <^_^@myrtana.sk> Date: Mon, 16 Sep 2024 00:23:34 +0200 Subject: [PATCH 3/4] User docker compose instead of docker-compose --- .github/workflows/c.yml | 28 ++++++++++++++-------------- README.md | 2 +- docs/random_notes.txt | 2 +- scripts/build-docker-release.sh | 2 +- scripts/build-docker.sh | 2 +- scripts/test-ssl-config.sh | 2 +- scripts/test-unix-socket.sh | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/c.yml b/.github/workflows/c.yml index 0d461a1..0d521aa 100644 --- a/.github/workflows/c.yml +++ b/.github/workflows/c.yml @@ -11,8 +11,8 @@ jobs: steps: - name: Checks out the repository uses: actions/checkout@v2 - - name: Starts docker-compose - run: DISTRO=archlinux docker-compose up -d + - name: Starts docker compose + run: DISTRO=archlinux docker compose up -d - name: Sleep uses: jakejarvis/wait-action@master with: @@ -24,8 +24,8 @@ jobs: steps: - name: Checks out the repository uses: actions/checkout@v2 - - name: Starts docker-compose - run: DISTRO=debian docker-compose up -d + - name: Starts docker compose + run: DISTRO=debian docker compose up -d - name: Sleep uses: jakejarvis/wait-action@master with: @@ -37,8 +37,8 @@ jobs: steps: - name: Checks out the repository uses: actions/checkout@v2 - - name: Starts docker-compose - run: DISTRO=fedora docker-compose up -d + - name: Starts docker compose + run: DISTRO=fedora docker compose up -d - name: Sleep uses: jakejarvis/wait-action@master with: @@ -50,8 +50,8 @@ jobs: steps: - name: Checks out the repository uses: actions/checkout@v2 - - name: Starts docker-compose - run: DISTRO=ubuntu docker-compose up -d + - name: Starts docker compose + run: DISTRO=ubuntu docker compose up -d - name: Sleep uses: jakejarvis/wait-action@master with: @@ -63,8 +63,8 @@ jobs: steps: - name: Checks out the repository uses: actions/checkout@v2 - - name: Starts docker-compose - run: DISTRO=ubuntu-lts docker-compose up -d + - name: Starts docker compose + run: DISTRO=ubuntu-lts docker compose up -d - name: Sleep uses: jakejarvis/wait-action@master with: @@ -76,8 +76,8 @@ jobs: steps: - name: Checks out the repository uses: actions/checkout@v2 - - name: Starts docker-compose - run: DISTRO=unix_socket docker-compose -f docker/docker-compose-unix-socket.yml up -d + - name: Starts docker compose + run: DISTRO=unix_socket docker compose -f docker/docker-compose-unix-socket.yml up -d - name: Sleep uses: jakejarvis/wait-action@master with: @@ -90,8 +90,8 @@ jobs: steps: - name: Checks out the repository uses: actions/checkout@v2 - - name: Starts docker-compose - run: DISTRO=unix_socket docker-compose -f docker/docker-compose-ssl-server.yml up -d + - name: Starts docker compose + run: DISTRO=unix_socket docker compose -f docker/docker-compose-ssl-server.yml up -d - name: Sleep uses: jakejarvis/wait-action@master with: diff --git a/README.md b/README.md index b332b79..18605b9 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ See `examples` and `scripts/compile_and_test.sh` to see how to set it up and use ## Build && Test in Docker -`docker-compose up` +`docker compose up` `./scripts/build-docker.sh` The result is in `./Debug/src` directory. diff --git a/docs/random_notes.txt b/docs/random_notes.txt index 3964a5f..4ee196e 100644 --- a/docs/random_notes.txt +++ b/docs/random_notes.txt @@ -100,7 +100,7 @@ __m128i_shift_right (offset=15, value= Date: Mon, 16 Sep 2024 00:23:56 +0200 Subject: [PATCH 4/4] Update README --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 18605b9..941fb32 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ You can store user and group information in `MariaDB` or `MySQL` database. E.g. - `libconfig` for configuration - uses direct queries and `real_escape_string` - uses `threads.c` from `C11` -- requirements: `Glibc 2.28`, `GCC 8`, equivalent of `Debian 10` (*Buster*) and newer, `MySQL 5.5+`/`MariaDB 10.0+`, `mariadb-connector-c`/`libmysqlclient`. Might work or compile on older systems, but it's untested +- requirements: `Glibc 2.28` or newer, `GCC 8` or newer, equivalent of `Debian 10` (*Buster*) or newer, `MySQL 5.5+`/`MariaDB 10.0+`, `mariadb-connector-c`/`libmysqlclient`. Might work or compile on older systems, but it's untested - tested systems - latest `Archlinux`, `Debian`, `Fedora`, `Ubuntu` and `Ubuntu LTS` - both *unix socket* and *hostname* + *port* are supported - accepts custom mysql client configuration @@ -24,6 +24,8 @@ You can store user and group information in `MariaDB` or `MySQL` database. E.g. - add RHEL (does not have bats) or Rockylinux/AlmaLinux - not sure if MySQL works correctly, the test fails on buff_test which means it does not increase buffer size for long result +Feedback is welcome. + ## Installation & Usage See `examples` and `scripts/compile_and_test.sh` to see how to set it up and use. @@ -73,7 +75,7 @@ Set `RELEASE` variable to any value to build a release build. ## License -Copyright (C) 2015-2023 Ivan Stana +Copyright (C) 2015-2024 Ivan Stana This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by