mirror of
https://github.com/bunkerity/bunkerweb
synced 2026-05-24 09:28:37 +00:00
linux - add missing dependency for rhel9 aarch64*
This commit is contained in:
florian
parent
9cec9ff762
commit
e3c968e8ae
2 changed files with 75 additions and 80 deletions
153
.github/workflows/beta.yml
vendored
153
.github/workflows/beta.yml
vendored
|
|
@ -43,60 +43,59 @@ jobs:
|
|||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
|
||||
# Create ARM environment
|
||||
# create-arm:
|
||||
# uses: ./.github/workflows/create-arm.yml
|
||||
# secrets:
|
||||
# SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
|
||||
# SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
|
||||
# SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
|
||||
# SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
# ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
|
||||
# ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
|
||||
create-arm:
|
||||
uses: ./.github/workflows/create-arm.yml
|
||||
secrets:
|
||||
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
|
||||
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
|
||||
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
|
||||
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
|
||||
ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
|
||||
|
||||
# Build arm64 + arm/v7 images
|
||||
# build-containers-arm:
|
||||
# needs: [create-arm]
|
||||
# strategy:
|
||||
# matrix:
|
||||
# image: [bunkerweb, scheduler, autoconf, ui]
|
||||
# arch: ["linux/arm64,linux/arm/v7"]
|
||||
# include:
|
||||
# - release: beta
|
||||
# cache: false
|
||||
# push: false
|
||||
# cache_suffix: arm
|
||||
# - image: bunkerweb
|
||||
# dockerfile: src/bw/Dockerfile
|
||||
# - image: scheduler
|
||||
# dockerfile: src/scheduler/Dockerfile
|
||||
# - image: autoconf
|
||||
# dockerfile: src/autoconf/Dockerfile
|
||||
# - image: ui
|
||||
# dockerfile: src/ui/Dockerfile
|
||||
# uses: ./.github/workflows/container-build.yml
|
||||
# with:
|
||||
# RELEASE: ${{ matrix.release }}
|
||||
# ARCH: ${{ matrix.arch }}
|
||||
# IMAGE: ${{ matrix.image }}
|
||||
# DOCKERFILE: ${{ matrix.dockerfile }}
|
||||
# CACHE: ${{ matrix.cache }}
|
||||
# PUSH: ${{ matrix.push }}
|
||||
# CACHE_SUFFIX: ${{ matrix.cache_suffix }}
|
||||
# secrets:
|
||||
# DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
# DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
# ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
|
||||
# ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
|
||||
# ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
|
||||
build-containers-arm:
|
||||
needs: [create-arm]
|
||||
strategy:
|
||||
matrix:
|
||||
image: [bunkerweb, scheduler, autoconf, ui]
|
||||
arch: ["linux/arm64,linux/arm/v7"]
|
||||
include:
|
||||
- release: beta
|
||||
cache: false
|
||||
push: false
|
||||
cache_suffix: arm
|
||||
- image: bunkerweb
|
||||
dockerfile: src/bw/Dockerfile
|
||||
- image: scheduler
|
||||
dockerfile: src/scheduler/Dockerfile
|
||||
- image: autoconf
|
||||
dockerfile: src/autoconf/Dockerfile
|
||||
- image: ui
|
||||
dockerfile: src/ui/Dockerfile
|
||||
uses: ./.github/workflows/container-build.yml
|
||||
with:
|
||||
RELEASE: ${{ matrix.release }}
|
||||
ARCH: ${{ matrix.arch }}
|
||||
IMAGE: ${{ matrix.image }}
|
||||
DOCKERFILE: ${{ matrix.dockerfile }}
|
||||
CACHE: ${{ matrix.cache }}
|
||||
PUSH: ${{ matrix.push }}
|
||||
CACHE_SUFFIX: ${{ matrix.cache_suffix }}
|
||||
secrets:
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
|
||||
ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
|
||||
ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
|
||||
|
||||
# Build Linux packages
|
||||
build-packages:
|
||||
# needs: [create-arm]
|
||||
needs: [create-arm]
|
||||
strategy:
|
||||
matrix:
|
||||
linux: [ubuntu, debian, fedora, rhel, rhel9]
|
||||
# platforms: [linux/amd64, linux/arm64]
|
||||
platforms: [linux/amd64]
|
||||
platforms: [linux/amd64, linux/arm64]
|
||||
include:
|
||||
- release: beta
|
||||
- linux: ubuntu
|
||||
|
|
@ -126,8 +125,7 @@ jobs:
|
|||
# Wait for all builds and extract VERSION
|
||||
wait-builds:
|
||||
runs-on: ubuntu-latest
|
||||
# needs: [build-containers, build-containers-arm, build-packages]
|
||||
needs: [build-containers, build-packages]
|
||||
needs: [build-containers, build-containers-arm, build-packages]
|
||||
outputs:
|
||||
version: ${{ steps.getversion.outputs.version }}
|
||||
versionrpm: ${{ steps.getversionrpm.outputs.versionrpm }}
|
||||
|
|
@ -146,12 +144,10 @@ jobs:
|
|||
permissions:
|
||||
contents: read
|
||||
packages: write
|
||||
# needs: [create-arm, wait-builds]
|
||||
needs: [wait-builds]
|
||||
needs: [create-arm, wait-builds]
|
||||
strategy:
|
||||
matrix:
|
||||
image:
|
||||
[bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
|
||||
image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui]
|
||||
include:
|
||||
- release: beta
|
||||
- image: bunkerweb
|
||||
|
|
@ -185,8 +181,7 @@ jobs:
|
|||
strategy:
|
||||
matrix:
|
||||
linux: [ubuntu, debian, fedora, el, el9]
|
||||
# arch: [amd64, arm64]
|
||||
arch: [amd64]
|
||||
arch: [amd64, arm64]
|
||||
include:
|
||||
- release: beta
|
||||
repo: bunkerweb
|
||||
|
|
@ -230,21 +225,21 @@ jobs:
|
|||
- linux: el9
|
||||
arch: amd64
|
||||
package_arch: x86_64
|
||||
# - linux: ubuntu
|
||||
# arch: arm64
|
||||
# package_arch: arm64
|
||||
# - linux: debian
|
||||
# arch: arm64
|
||||
# package_arch: arm64
|
||||
# - linux: fedora
|
||||
# arch: arm64
|
||||
# package_arch: aarch64
|
||||
# - linux: el
|
||||
# arch: arm64
|
||||
# package_arch: aarch64
|
||||
# - linux: el9
|
||||
# arch: arm64
|
||||
# package_arch: aarch64
|
||||
- linux: ubuntu
|
||||
arch: arm64
|
||||
package_arch: arm64
|
||||
- linux: debian
|
||||
arch: arm64
|
||||
package_arch: arm64
|
||||
- linux: fedora
|
||||
arch: arm64
|
||||
package_arch: aarch64
|
||||
- linux: el
|
||||
arch: arm64
|
||||
package_arch: aarch64
|
||||
- linux: el9
|
||||
arch: arm64
|
||||
package_arch: aarch64
|
||||
uses: ./.github/workflows/push-packagecloud.yml
|
||||
with:
|
||||
SEPARATOR: ${{ matrix.separator }}
|
||||
|
|
@ -290,13 +285,13 @@ jobs:
|
|||
BUNKERBOT_TOKEN: ${{ secrets.BUNKERBOT_TOKEN }}
|
||||
|
||||
# Remove ARM VM
|
||||
# rm-arm:
|
||||
# if: ${{ always() }}
|
||||
# needs: [create-arm, push-images, build-packages]
|
||||
# uses: ./.github/workflows/rm-arm.yml
|
||||
# secrets:
|
||||
# ARM_ID: ${{ needs.create-arm.outputs.id }}
|
||||
# SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
|
||||
# SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
|
||||
# SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
|
||||
# SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
rm-arm:
|
||||
if: ${{ always() }}
|
||||
needs: [create-arm, push-images, build-packages]
|
||||
uses: ./.github/workflows/rm-arm.yml
|
||||
secrets:
|
||||
ARM_ID: ${{ needs.create-arm.outputs.id }}
|
||||
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
|
||||
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
|
||||
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}
|
||||
SCW_DEFAULT_ORGANIZATION_ID: ${{ secrets.SCW_DEFAULT_ORGANIZATION_ID }}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9
|
|||
RUN dnf install -y wget make yum-utils && \
|
||||
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
|
||||
dnf install -y --skip-broken --setopt=install_weak_deps=False --nobest openssl-libs openssl-devel && \
|
||||
dnf install -y --skip-broken --setopt=install_weak_deps=False readline-devel python39 brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl libxslt bash gd gd-devel gcc-c++ znc-modtcl gawk libtool pcre-devel automake autoconf gcc make git zlib-devel libxml2-devel pkgconf libcurl-devel libmaxminddb && \
|
||||
dnf install -y --skip-broken --setopt=install_weak_deps=False readline-devel python39 python39-devel brotli brotli-devel gperftools-devel perl libxslt-devel libxml2 yajl libxslt bash gd gd-devel gcc-c++ znc-modtcl gawk libtool pcre-devel automake autoconf gcc make git zlib-devel libxml2-devel pkgconf libcurl-devel libmaxminddb && \
|
||||
dnf install -y https://nginx.org/packages/rhel/9/$(uname -m)/RPMS/nginx-${NGINX_VERSION}-1.el9.ngx.$(uname -m).rpm
|
||||
|
||||
WORKDIR /tmp/bunkerweb/deps
|
||||
|
|
|
|||
Loading…
Reference in a new issue