ci/cd - temp disable autoconf tests and add missing packages for linux/centos
This commit is contained in:
florian
parent
202f21aab8
commit
b3eb647459
|
|
@ -131,13 +131,13 @@ jobs:
|
|||
TYPE: docker
|
||||
secrets:
|
||||
CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
|
||||
create-infra-autoconf:
|
||||
needs: [code-security, build-bw, build-scheduler, build-autoconf]
|
||||
uses: ./.github/workflows/staging-create-infra.yml
|
||||
with:
|
||||
TYPE: autoconf
|
||||
secrets:
|
||||
CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
|
||||
# create-infra-autoconf:
|
||||
# needs: [code-security, build-bw, build-scheduler, build-autoconf]
|
||||
# uses: ./.github/workflows/staging-create-infra.yml
|
||||
# with:
|
||||
# TYPE: autoconf
|
||||
# secrets:
|
||||
# CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
|
||||
create-infra-swarm:
|
||||
needs: [code-security, build-bw, build-scheduler, build-autoconf]
|
||||
uses: ./.github/workflows/staging-create-infra.yml
|
||||
|
|
@ -176,13 +176,13 @@ jobs:
|
|||
TYPE: docker
|
||||
RUNS_ON: "['self-hosted', 'bw-docker']"
|
||||
secrets: inherit
|
||||
tests-autoconf:
|
||||
needs: [create-infra-autoconf]
|
||||
uses: ./.github/workflows/staging-tests.yml
|
||||
with:
|
||||
TYPE: autoconf
|
||||
RUNS_ON: "['self-hosted', 'bw-autoconf']"
|
||||
secrets: inherit
|
||||
# tests-autoconf:
|
||||
# needs: [create-infra-autoconf]
|
||||
# uses: ./.github/workflows/staging-tests.yml
|
||||
# with:
|
||||
# TYPE: autoconf
|
||||
# RUNS_ON: "['self-hosted', 'bw-autoconf']"
|
||||
# secrets: inherit
|
||||
tests-swarm:
|
||||
needs: [create-infra-swarm]
|
||||
uses: ./.github/workflows/staging-tests.yml
|
||||
|
|
@ -222,14 +222,14 @@ jobs:
|
|||
TYPE: docker
|
||||
secrets:
|
||||
CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
|
||||
delete-infra-autoconf:
|
||||
if: ${{ always() }}
|
||||
needs: [tests-autoconf]
|
||||
uses: ./.github/workflows/staging-delete-infra.yml
|
||||
with:
|
||||
TYPE: autoconf
|
||||
secrets:
|
||||
CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
|
||||
# delete-infra-autoconf:
|
||||
# if: ${{ always() }}
|
||||
# needs: [tests-autoconf]
|
||||
# uses: ./.github/workflows/staging-delete-infra.yml
|
||||
# with:
|
||||
# TYPE: autoconf
|
||||
# secrets:
|
||||
# CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
|
||||
delete-infra-swarm:
|
||||
if: ${{ always() }}
|
||||
needs: [tests-swarm]
|
||||
|
|
@ -255,98 +255,98 @@ jobs:
|
|||
secrets:
|
||||
CICD_SECRETS: ${{ secrets.CICD_SECRETS }}
|
||||
|
||||
# Push containers
|
||||
push-bunkerweb:
|
||||
needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-docker.yml
|
||||
with:
|
||||
PRIVATE_IMAGE: bunkerweb-tests:staging
|
||||
PUBLIC_IMAGE: bunkerweb:beta
|
||||
secrets:
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
push-scheduler:
|
||||
needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-docker.yml
|
||||
with:
|
||||
PRIVATE_IMAGE: scheduler-tests:staging
|
||||
PUBLIC_IMAGE: bunkerweb-scheduler:beta
|
||||
secrets:
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
push-autoconf:
|
||||
needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-docker.yml
|
||||
with:
|
||||
PRIVATE_IMAGE: autoconf-tests:staging
|
||||
PUBLIC_IMAGE: bunkerweb-autoconf:beta
|
||||
secrets:
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
push-ui:
|
||||
needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-docker.yml
|
||||
with:
|
||||
PRIVATE_IMAGE: ui-tests:staging
|
||||
PUBLIC_IMAGE: bunkerweb-ui:beta
|
||||
secrets:
|
||||
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
# # Push containers
|
||||
# push-bunkerweb:
|
||||
# needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-docker.yml
|
||||
# with:
|
||||
# PRIVATE_IMAGE: bunkerweb-tests:staging
|
||||
# PUBLIC_IMAGE: bunkerweb:beta
|
||||
# secrets:
|
||||
# DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
# DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
# PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
# PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
# push-scheduler:
|
||||
# needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-docker.yml
|
||||
# with:
|
||||
# PRIVATE_IMAGE: scheduler-tests:staging
|
||||
# PUBLIC_IMAGE: bunkerweb-scheduler:beta
|
||||
# secrets:
|
||||
# DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
# DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
# PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
# PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
# push-autoconf:
|
||||
# needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-docker.yml
|
||||
# with:
|
||||
# PRIVATE_IMAGE: autoconf-tests:staging
|
||||
# PUBLIC_IMAGE: bunkerweb-autoconf:beta
|
||||
# secrets:
|
||||
# DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
# DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
# PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
# PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
# push-ui:
|
||||
# needs: [tests-docker, tests-autoconf, tests-swarm, tests-k8s, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-docker.yml
|
||||
# with:
|
||||
# PRIVATE_IMAGE: ui-tests:staging
|
||||
# PUBLIC_IMAGE: bunkerweb-ui:beta
|
||||
# secrets:
|
||||
# DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
|
||||
# DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
|
||||
# PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
|
||||
# PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
|
||||
|
||||
# Push Linux packages
|
||||
push-ubuntu:
|
||||
needs: [tests-linux, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
with:
|
||||
SEPARATOR: _
|
||||
SUFFIX: amd64
|
||||
REPO: bunkerweb-dev
|
||||
LINUX: ubuntu
|
||||
VERSION: jammy
|
||||
PACKAGE: deb
|
||||
secrets:
|
||||
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
push-debian:
|
||||
needs: [tests-linux, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
with:
|
||||
SEPARATOR: _
|
||||
SUFFIX: amd64
|
||||
REPO: bunkerweb-dev
|
||||
LINUX: debian
|
||||
VERSION: bullseye
|
||||
PACKAGE: deb
|
||||
secrets:
|
||||
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
push-rhel:
|
||||
needs: [tests-linux, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
with:
|
||||
SEPARATOR: "-"
|
||||
SUFFIX: 1.x86_64
|
||||
REPO: bunkerweb-dev
|
||||
LINUX: el
|
||||
VERSION: 8
|
||||
PACKAGE: rpm
|
||||
secrets:
|
||||
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
push-fedora:
|
||||
needs: [tests-linux, tests-ui]
|
||||
uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
with:
|
||||
SEPARATOR: "-"
|
||||
SUFFIX: 1.x86_64
|
||||
REPO: bunkerweb-dev
|
||||
LINUX: fedora
|
||||
VERSION: 37
|
||||
PACKAGE: rpm
|
||||
secrets:
|
||||
PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
# # Push Linux packages
|
||||
# push-ubuntu:
|
||||
# needs: [tests-linux, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
# with:
|
||||
# SEPARATOR: _
|
||||
# SUFFIX: amd64
|
||||
# REPO: bunkerweb-dev
|
||||
# LINUX: ubuntu
|
||||
# VERSION: jammy
|
||||
# PACKAGE: deb
|
||||
# secrets:
|
||||
# PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
# push-debian:
|
||||
# needs: [tests-linux, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
# with:
|
||||
# SEPARATOR: _
|
||||
# SUFFIX: amd64
|
||||
# REPO: bunkerweb-dev
|
||||
# LINUX: debian
|
||||
# VERSION: bullseye
|
||||
# PACKAGE: deb
|
||||
# secrets:
|
||||
# PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
# push-rhel:
|
||||
# needs: [tests-linux, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
# with:
|
||||
# SEPARATOR: "-"
|
||||
# SUFFIX: 1.x86_64
|
||||
# REPO: bunkerweb-dev
|
||||
# LINUX: el
|
||||
# VERSION: 8
|
||||
# PACKAGE: rpm
|
||||
# secrets:
|
||||
# PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
# push-fedora:
|
||||
# needs: [tests-linux, tests-ui]
|
||||
# uses: ./.github/workflows/staging-push-packagecloud.yml
|
||||
# with:
|
||||
# SEPARATOR: "-"
|
||||
# SUFFIX: 1.x86_64
|
||||
# REPO: bunkerweb-dev
|
||||
# LINUX: fedora
|
||||
# VERSION: 37
|
||||
# PACKAGE: rpm
|
||||
# secrets:
|
||||
# PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
--license agpl3
|
||||
--version %VERSION%
|
||||
--architecture x86_64
|
||||
--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends brotli
|
||||
--depends bash --depends epel-release --depends python39 --depends 'nginx = 1:1.22.1-1.el8.ngx' --depends libcurl-devel --depends libxml2 --depends lmdb-libs --depends GeoIP-devel --depends file-libs --depends net-tools --depends gd --depends sudo --depends procps --depends lsof --depends brotli --depends openssl
|
||||
--description "BunkerWeb %VERSION% for CentOS Stream 8"
|
||||
--url "https://www.bunkerweb.io"
|
||||
--maintainer "Bunkerity <contact at bunkerity dot com>"
|
||||
--before-install /usr/share/bunkerweb/scripts/beforeInstall.sh
|
||||
--after-install /usr/share/bunkerweb/scripts/postinstall.sh
|
||||
--after-remove /usr/share/bunkerweb/scripts/afterRemoveRPM.sh
|
||||
/usr/share/bunkerweb/=/usr/share/bunkerweb/ /usr/bin/bwcli=/usr/bin/bwcli /etc/bunkerweb/=/etc/bunkerweb /var/tmp/bunkerweb/=/var/tmp/bunkerweb /var/cache/bunkerweb/=/var/cache/bunkerweb /lib/systemd/system/bunkerweb.service=/lib/systemd/system/bunkerweb.service /lib/systemd/system/bunkerweb-ui.service=/lib/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt
|
||||
/usr/share/bunkerweb/=/usr/share/bunkerweb/ /usr/bin/bwcli=/usr/bin/bwcli /etc/bunkerweb/=/etc/bunkerweb /var/tmp/bunkerweb/=/var/tmp/bunkerweb /var/cache/bunkerweb/=/var/cache/bunkerweb /lib/systemd/system/bunkerweb.service=/lib/systemd/system/bunkerweb.service /lib/systemd/system/bunkerweb-ui.service=/lib/systemd/system/bunkerweb-ui.service /var/lib/bunkerweb=/var/lib/bunkerweb /etc/letsencrypt=/etc/letsencrypt
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ rm -f /lib/systemd/system/anaconda.target.wants/*;
|
|||
|
||||
COPY src/linux/nginx.repo /etc/yum.repos.d/nginx.repo
|
||||
|
||||
RUN dnf install php-fpm curl yum-utils epel-release -y && \
|
||||
RUN dnf install php-fpm curl yum-utils epel-release which -y && \
|
||||
dnf install nginx-1.22.1 -y
|
||||
|
||||
COPY ./package-centos/*.rpm /opt
|
||||
|
|
|
|||
Loading…
Reference in New Issue