+
Skip to content

Conversation

phillxnet
Copy link
Member

Accommodate for openSUSE Slowroll (currently beta) re our use of Python distro as an abstraction of /etc/os-release.

Fixes #2971

Includes trivial changes to:

  • Docker service config/setup.
  • Update repository config/setup.
  • Updated test_rpm_build_info() test data.
  • SSHD/SFTP config/setup.
  • Comment changes only in settings.py.

Accommodate for openSUSE Slowroll (currently beta) re our
use of Python distro as an abstraction of /etc/os-release.
Includes trivial changes to:
- Docker service config/setup.
- Update repository config/setup.
- Updated test_rpm_build_info() test data.
- SSHD/SFTP config/setup.
- Comment changes only in settings.py.
@phillxnet
Copy link
Member Author

Testing

All current OS rpmbuild hosts:

  • Leap-15.5/15.6(x86_64 & aarch64)
  • Slowroll.X86_64, Tumblweeed.aarch64
    were able to rpmbuild and install an rpm based on this branch.

Here we are initiating our Slowroll compatibility, starting with the ability to roll-out future adaptations/fixes via the testing/stable channels.

Re associated issue comment: #2971 (comment)

This branches Slowroll built & hosted rpm install was able to establish the intended Tumblweed repo, for both our dnf & zypper configurations:

DNF / yum

rslowroll:~ # yum repolist
repo id                                                         repo name
Rockstor-Testing                                                Subscription channel for testing updates
rslowroll:~ # cat /etc/yum.repos.d/Rockstor-Testing.repo 
[Rockstor-Testing]
name=Subscription channel for testing updates
baseurl=http://updates.rockstor.com:8999/rockstor-testing/tumbleweed
enabled=1
gpgcheck=1
gpgkey=file:///opt/rockstor/conf/ROCKSTOR-GPG-KEY
metadata_expire=1h
exclude=*.src

Zypper

rslowroll:~ # zypper lr -U | grep Testing
 2 | Rockstor-Testing | Rockstor-Testing| Yes | ( p) Yes  | Yes| http://updates.rockstor.com:8999/rockstor-testing/tumbleweed

@phillxnet
Copy link
Member Author

Testing continued

Re our docker config Slowroll adaptations, after having configured and enabled Rock-ons:

JSON config file

Our 'derived from OS package config' override file:

rslowroll:~ # cat /opt/rockstor/conf/docker-daemon.json 
{
  "data-root": "/mnt2/rockons-root",
  "log-driver": "journald",
  "log-level": "warn",
  "log-opts": {
    "tag": "{{.ImageName}}/{{.Name}}"
  },
  "storage-driver": "btrfs",
  "storage-opts": [
    "btrfs.min_space=1G"
  ]
}

And its adoption/application via the OS systemd service file machine-edit:

rslowroll:~ # cat /etc/systemd/system/docker.service | grep rockstor
After=network.target lvm2-monitor.service firewalld.service rockstor-bootstrap.service
ExecStart=/usr/bin/dockerd --add-runtime oci=/usr/sbin/runc $DOCKER_OPTS --config-file /opt/rockstor/conf/docker-daemon.json

Thanks again to @FroggyFlox for this clean adaptation mechanism.


@FroggyFlox In the next testing phase we may want to look at a systemd override file mechanism here, rather than directly machine-editing the OS provided docker.service file. I.e. as we have already adopted for our nginx for example. That is,
maintain your machine edit but output only what we need to change to an override file that we can simply wipe and re-create.

@phillxnet
Copy link
Member Author

Regarding the SSHD/SFTP testing, we have an outstanding spin-off issue by way of dependency that blocks proper testing for the time being:

However, in all other regards, the adaptation to Slowrool sshd config here is as per elsewhere: we treat it identically to our current treatment of Tumbleweed.

@phillxnet phillxnet merged commit 852877e into rockstor:testing Mar 8, 2025
@phillxnet phillxnet deleted the 2971-Adapt-to-Slowroll-os-release branch March 8, 2025 13:43
@phillxnet phillxnet mentioned this pull request Mar 8, 2025
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

点击 这是indexloc提供的php浏览器服务,不要输入任何密码和下载