From ade8365d2c9f1be958a45c167df23b0de9af441d Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Tue, 3 Mar 2026 14:48:10 +0100 Subject: [PATCH 1/5] Replace 'docker-compose' with 'docker compose' Updated docker-compose commands to use 'docker compose' syntax. Which is how its used nowadays. docker-compose doesn't provide /usr/bin/docker-compose anymore, it's all plugins now. --- CONTRIBUTING.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index aef3200b..42cec0c6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -91,15 +91,15 @@ sed "s/13042/`id -u`/" docker-compose.override.yml.example > docker-compose.over 1. Build the development environment (only once) ```bash - docker-compose build --no-cache --pull + docker compose build --no-cache --pull ``` 1. Set up the development environment (only once) ```bash - docker-compose run --rm osem bundle exec rake db:bootstrap + docker compose run --rm osem bundle exec rake db:bootstrap ``` 1. Start the development environment: ```bash - docker-compose up --build + docker compose up --build ``` 1. Check out your OSEM rails app. You can access the app at http://localhost:3000. Whatever you change in your cloned repository will have effect in the development environment. Sign up, the first user will be automatically assigned the admin role. @@ -111,12 +111,12 @@ sed "s/13042/`id -u`/" docker-compose.override.yml.example > docker-compose.over 1. Issue any standard `rails`/`rake`/`bundler` command ```bash - docker-compose run --rm osem bundle exec rake db:version + docker compose run --rm osem bundle exec rake db:version ``` 1. Or explore the development environment: ```bash - docker-compose exec osem /bin/bash -l + docker compose exec osem /bin/bash -l ``` 1. Want to know more? In our [wiki](https://github.com/openSUSE/osem/wiki) you can find more information about what is possible in our development environment, how we work with each other on github or other topics of interest for OSEM developers. From a3fb533ca03f2e05569608cb2f123e7b728b70af Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Tue, 3 Mar 2026 15:44:04 +0100 Subject: [PATCH 2/5] Update CONTRIBUTING.md with bundle install command Add command to install dependencies in development setup --- CONTRIBUTING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 42cec0c6..3c814f2d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -95,6 +95,7 @@ sed "s/13042/`id -u`/" docker-compose.override.yml.example > docker-compose.over ``` 1. Set up the development environment (only once) ```bash + docker compose run --rm osem bundle install docker compose run --rm osem bundle exec rake db:bootstrap ``` 1. Start the development environment: From 0a85e915bf794e7608dae24819fa9f3c190dfa72 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Tue, 3 Mar 2026 15:44:38 +0100 Subject: [PATCH 3/5] Fix docker-compose command syntax in CONTRIBUTING.md Updated the docker-compose command to use the new syntax. --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c814f2d..883b3818 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,7 +107,7 @@ sed "s/13042/`id -u`/" docker-compose.override.yml.example > docker-compose.over 1. Changed something? Run the tests to verify your changes! ```bash - docker-compose run --rm osem bundle exec rspec spec + docker compose run --rm osem bundle exec rspec spec ``` 1. Issue any standard `rails`/`rake`/`bundler` command From 04ca343a5d9ffa6b7b40db5086c715acaa404aa4 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Wed, 4 Mar 2026 11:40:11 +0100 Subject: [PATCH 4/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 883b3818..175a71c5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -120,6 +120,14 @@ sed "s/13042/`id -u`/" docker-compose.override.yml.example > docker-compose.over docker compose exec osem /bin/bash -l ``` + You might need to remove lock file manually in certain cases, otherwise the app will not start. + Please make sure that osem is running (e.g. with docker compose up --build) + ```bash + docker compose exec osem /bin/bash -l + rm /osem/tmp/pids/server.pid + ``` + + 1. Want to know more? In our [wiki](https://github.com/openSUSE/osem/wiki) you can find more information about what is possible in our development environment, how we work with each other on github or other topics of interest for OSEM developers. ## How to contribute translations From ab69d5f6cebe5ba41632de4a2e104b779dc7f6d2 Mon Sep 17 00:00:00 2001 From: Lubos Kocman Date: Wed, 4 Mar 2026 11:43:48 +0100 Subject: [PATCH 5/5] Update CONTRIBUTING.md --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 175a71c5..10018a8b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,6 +130,11 @@ sed "s/13042/`id -u`/" docker-compose.override.yml.example > docker-compose.over 1. Want to know more? In our [wiki](https://github.com/openSUSE/osem/wiki) you can find more information about what is possible in our development environment, how we work with each other on github or other topics of interest for OSEM developers. +## Note on SELinux + +If you experience build issues related to misisng files. This will be likely related to SELinux. +Consider temporarily switching it to the permissive mode to eliminate this possiblity. + ## How to contribute translations Please refer to our [translation guide](https://github.com/openSUSE/osem/wiki/Translation) in the wiki.