diff --git a/.github/workflows/linux-rpm.yml b/.github/workflows/linux-rpm.yml index c78d408..5769b15 100644 --- a/.github/workflows/linux-rpm.yml +++ b/.github/workflows/linux-rpm.yml @@ -9,8 +9,12 @@ jobs: version: el8 - name: Enterprise Linux 9 version: el9 + - name: Enterprise Linux 10 + version: el10 - name: openSUSE Leap 15.5 version: lp155 + - name: openSUSE Leap 16.0 + version: lp160 steps: - name: Cloning uses: actions/checkout@v6 diff --git a/Containerfile b/Containerfile index b7fd545..117bafb 100644 --- a/Containerfile +++ b/Containerfile @@ -58,7 +58,7 @@ RUN apk add --no-cache \ COPY --from=build /opt/dtranslatebot/bin/dtranslatebot /opt/dtranslatebot/bin/ COPY --from=build /opt/dtranslatebot/lib/*.so /opt/dtranslatebot/lib/ COPY --from=build /opt/dtranslatebot/lib/*.so.* /opt/dtranslatebot/lib/ -RUN adduser --disabled-password dtranslatebot +RUN adduser -D dtranslatebot USER dtranslatebot WORKDIR /home/dtranslatebot COPY --from=build /build/dtranslatebot.json . diff --git a/rpmsrc/dtranslatebot.spec b/rpmsrc/dtranslatebot.spec index c9c5997..e93596c 100644 --- a/rpmsrc/dtranslatebot.spec +++ b/rpmsrc/dtranslatebot.spec @@ -26,7 +26,9 @@ Source2: %{name}.service Source3: %{name}.sysusersd %if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 10 BuildRequires: %{?toolset_prefix}annobin +%endif BuildRequires: curl-devel %if 0%{?rhel} && 0%{?rhel} < 9 BuildRequires: epel-rpm-macros-systemd