Replace sudo with doas on alpine

Signed-off-by: Christian König <github@yubiuser.dev>
Fix libcap capabilities not being granted on OpenRC distros (#6456 )
2025-11-03 22:23:12 +01:00 · 2025-11-02 16:43:36 +01:00 · 2025-11-02 07:29:20 +11:00 · 2025-11-01 12:26:46 +01:00 · 2025-11-01 11:33:37 +01:00 · 2025-11-01 10:01:18 +00:00
6 changed files with 35 additions and 6 deletions
@@ -29,12 +29,12 @@ jobs:
    # Initializes the CodeQL tools for scanning.
    -
      name: Initialize CodeQL
-      uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb #v4.31.0
+      uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee #v4.31.2
      with:
        languages: 'python'
    -
      name: Autobuild
-      uses: github/codeql-action/autobuild@4e94bd11f71e507f7f87df81788dff88d1dacbfb #v4.31.0
+      uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee #v4.31.2
    -
      name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb #v4.31.0
+      uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee #v4.31.2
@@ -74,6 +74,7 @@ jobs:
            fedora_40,
            fedora_41,
            fedora_42,
+            fedora_43,
            alpine_3_21,
            alpine_3_22,
          ]
@@ -13,7 +13,7 @@ extra_started_commands="reload"

 respawn_max=5
 respawn_period=60
-capabilities="^CAP_NET_BIND_SERVICE,CAP_NET_RAW,CAP_NET_ADMIN,CAP_SYS_NICE,CAP_IPC_LOCK,CAP_CHOWN,CAP_SYS_TIME"
+capabilities="^CAP_NET_BIND_SERVICE,^CAP_NET_RAW,^CAP_NET_ADMIN,^CAP_SYS_NICE,^CAP_IPC_LOCK,^CAP_CHOWN,^CAP_SYS_TIME"

 depend() {
    want net
@@ -155,7 +155,7 @@ EOM
 )

 # List of required packages on APK based systems
-PIHOLE_META_VERSION_APK=0.1
+PIHOLE_META_VERSION_APK=0.2
 PIHOLE_META_DEPS_APK=(
    bash
    bash-completion
@@ -165,6 +165,8 @@ PIHOLE_META_DEPS_APK=(
    cronie
    curl
    dialog
+    doas # sudo replacement
+    doas-sudo-shim
    git
    grep
    iproute2-minimal # piholeARPTable.sh
@@ -178,7 +180,6 @@ PIHOLE_META_DEPS_APK=(
    procps-ng
    psmisc
    shadow
-    sudo
    tzdata
    unzip
    wget
@@ -0,0 +1,17 @@
+FROM fedora:43
+RUN dnf install -y git initscripts
+
+ENV GITDIR=/etc/.pihole
+ENV SCRIPTDIR=/opt/pihole
+
+RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
+ADD . $GITDIR
+RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $GITDIR/advanced/Scripts/COL_TABLE $SCRIPTDIR/
+ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+
+RUN true && \
+    chmod +x $SCRIPTDIR/*
+
+ENV SKIP_INSTALL=true
+
+#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
@@ -0,0 +1,10 @@
+[tox]
+envlist = py3
+
+[testenv]
+allowlist_externals = docker
+deps = -rrequirements.txt
+setenv =
+    COLUMNS=120
+commands = docker buildx build --load --progress plain -f _fedora_43.Dockerfile -t pytest_pihole:test_container ../
+           pytest {posargs:-vv -n auto} ./test_any_automated_install.py ./test_any_utils.py ./test_centos_fedora_common_support.py
Author	SHA1	Message	Date
Christian König	7df117876f	Replace sudo with doas on alpine CodeQL / Analyze (pull_request) Has been cancelled Details Test Supported Distributions / smoke-tests (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (alpine_3_21) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (alpine_3_22) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (centos_10) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (centos_9) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (debian_11) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (debian_12) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (debian_13) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (fedora_40) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (fedora_41) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (fedora_42) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (fedora_43) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (ubuntu_20) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (ubuntu_22) (pull_request) Has been cancelled Details Test Supported Distributions / distro-test (ubuntu_24) (pull_request) Has been cancelled Details Signed-off-by: Christian König <github@yubiuser.dev>	2025-11-03 22:23:12 +01:00
yubiuser	ff75860de3	Fix libcap capabilities not being granted on OpenRC distros (#6456 )	2025-11-02 16:43:36 +01:00
Sparronator9999	4ff250edac	Fix libcap capabilities not being granted on OpenRC distros Created on behalf of @mgziminsky - see this issue comment: https://github.com/pi-hole/pi-hole/issues/6454#issuecomment-3476576177 Signed-off-by: Sparronator9999 <86388887+Sparronator9999@users.noreply.github.com>	2025-11-02 07:29:20 +11:00
yubiuser	2e24c2d805	Add Fedora 43 to test suite (#6453 )	2025-11-01 12:26:46 +01:00
yubiuser	c7ebaece92	Bump github/codeql-action from 4.31.0 to 4.31.2 in the github-actions-dependencies group (#6455 )	2025-11-01 11:33:37 +01:00
dependabot[bot]	766e61c52a	Bump github/codeql-action in the github-actions-dependencies group Bumps the github-actions-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action). Updates `github/codeql-action` from 4.31.0 to 4.31.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/4e94bd11f71e507f7f87df81788dff88d1dacbfb...0499de31b99561a6d14a36a5f662c2a54f91beee) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions-dependencies ... Signed-off-by: dependabot[bot] <support@github.com>	2025-11-01 10:01:18 +00:00
Christian König	558f0c4bf7	Add Fedora 43 to test suite Signed-off-by: yubiuser <github@yubiuser.dev>	2025-10-31 18:54:42 +01:00
Adam Warner	23e48cf544	Sync master back into development (#6448 )	2025-10-28 17:18:45 +00:00