diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 959bfe0f2..830166ddf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,360 +7,242 @@ on: branches: [master] jobs: - # Build BW amd64 + i386 images - build-bw-amd64: + + # Build amd64 + 386 containers images + build-containers: + strategy: + matrix: + image: [bunkerweb, scheduler, autoconf, ui] + arch: [linux/amd64, linux/386] + include: + - release: latest + cache: false + push: false + - image: bunkerweb + dockerfile: src/bw/Dockerfile + - image: scheduler + dockerfile: src/scheduler/Dockerfile + - image: autoconf + dockerfile: src/autoconf/Dockerfile + - image: ui + dockerfile: src/ui/Dockerfile + - arch: linux/amd64 + cache_suffix: amd64 + - arch: linux/386 + cache_suffix: "386" uses: ./.github/workflows/container-build.yml with: - RELEASE: latest - ARCH: linux/amd64 - IMAGE: bunkerweb - DOCKERFILE: src/bw/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - build-bw-386: - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/386 - IMAGE: bunkerweb - DOCKERFILE: src/bw/Dockerfile - CACHE: false - PUSH: false + 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 }} - # Build SC amd64 + i386 images - build-sc-amd64: - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/amd64 - IMAGE: scheduler - DOCKERFILE: src/scheduler/Dockerfile - CACHE: false - PUSH: false + # Create ARM environment + create-arm: + uses: ./.github/workflows/create-arm.yml secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - build-sc-386: - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/386 - IMAGE: scheduler - DOCKERFILE: src/scheduler/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - - # Build AU amd64 + i386 images - build-au-amd64: - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/amd64 - IMAGE: autoconf - DOCKERFILE: src/autoconf/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - build-au-386: - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/386 - IMAGE: autoconf - DOCKERFILE: src/autoconf/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - - # Build UI amd64 + i386 images - build-ui-amd64: - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/amd64 - IMAGE: ui - DOCKERFILE: src/ui/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - build-ui-386: - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/386 - IMAGE: ui - DOCKERFILE: src/ui/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} + 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-bw-arm: + build-containers-arm: + needs: [create-arm] + strategy: + matrix: + image: [bunkerweb, scheduler, autoconf, ui] + arch: ["linux/arm64,linux/arm/v7"] + include: + - release: latest + 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: latest - ARCH: linux/arm64,linux/arm/v7 - IMAGE: bunkerweb - DOCKERFILE: src/bw/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - build-sc-arm: - needs: ["build-bw-arm"] - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/arm64,linux/arm/v7 - IMAGE: scheduler - DOCKERFILE: src/scheduler/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - build-au-arm: - needs: ["build-sc-arm"] - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/arm64,linux/arm/v7 - IMAGE: autoconf - DOCKERFILE: src/autoconf/Dockerfile - CACHE: false - PUSH: false - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - build-ui-arm: - needs: ["build-au-arm"] - uses: ./.github/workflows/container-build.yml - with: - RELEASE: latest - ARCH: linux/arm64,linux/arm/v7 - IMAGE: ui - DOCKERFILE: src/ui/Dockerfile - CACHE: false - PUSH: false + 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 }} - # Linux packages - build-ubuntu: + # Build Linux packages + build-packages: + needs: [create-arm] + strategy: + matrix: + linux: [ubuntu, debian, fedora, rhel] + platforms: [linux/amd64, linux/arm64] + include: + - release: latest + - linux: ubuntu + package: deb + - linux: debian + package: deb + - linux: fedora + package: rpm + - linux: rhel + package: rpm uses: ./.github/workflows/linux-build.yml with: - RELEASE: latest - LINUX: ubuntu - PACKAGE: deb - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - build-debian: - uses: ./.github/workflows/linux-build.yml - with: - RELEASE: latest - LINUX: debian - PACKAGE: deb - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - # build-centos: - # uses: ./.github/workflows/linux-build.yml - # with: - # RELEASE: latest - # LINUX: centos - # PACKAGE: rpm - # secrets: - # DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - # DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - # PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - # PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - build-fedora: - uses: ./.github/workflows/linux-build.yml - with: - RELEASE: latest - LINUX: fedora - PACKAGE: rpm - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} - PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} - build-rhel: - uses: ./.github/workflows/linux-build.yml - with: - RELEASE: latest - LINUX: rhel - PACKAGE: rpm + RELEASE: ${{ matrix.release }} + LINUX: ${{ matrix.linux }} + PACKAGE: ${{ matrix.package }} + TEST: false + PLATFORMS: ${{ matrix.platforms }} secrets: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }} PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }} + ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }} + ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }} + ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }} # Wait for all builds and extract VERSION wait-builds: runs-on: ubuntu-latest - needs: [ - build-bw-amd64, build-bw-386, - build-sc-amd64, build-sc-386, - build-au-amd64, build-au-386, - build-ui-amd64, build-ui-386, - build-ui-arm, - build-ubuntu, - build-debian, - build-fedora, - build-rhel - ] + needs: [build-containers, build-containers-arm, build-packages] outputs: version: ${{ steps.getversion.outputs.version }} + versionrpm: ${{ steps.getversionrpm.outputs.versionrpm }} steps: - name: Checkout source code uses: actions/checkout@v3 - name: Get VERSION id: getversion run: echo "version=$(cat src/VERSION | tr -d '\n')" >> "$GITHUB_OUTPUT" + - name: Get VERSION (for RPM based) + id: getversionrpm + run: echo "versionrpm=$(cat src/VERSION | tr -d '\n' | sed 's/-/_/g')" >> "$GITHUB_OUTPUT" # Push Docker images - push-bunkerweb: - needs: [wait-builds] + push-images: + needs: [create-arm, wait-builds] + strategy: + matrix: + image: [bunkerweb, bunkerweb-scheduler, bunkerweb-autoconf, bunkerweb-ui] + include: + - release: latest + - image: bunkerweb + cache_from: bunkerweb + dockerfile: src/bw/Dockerfile + - image: bunkerweb-scheduler + cache_from: scheduler + dockerfile: src/scheduler/Dockerfile + - image: bunkerweb-autoconf + cache_from: autoconf + dockerfile: src/autoconf/Dockerfile + - image: bunkerweb-ui + cache_from: ui + dockerfile: src/ui/Dockerfile uses: ./.github/workflows/push-docker.yml with: - IMAGE: bunkerity/bunkerweb:latest,bunkerity/bunkerweb:${{ needs.wait-builds.outputs.version }} - CACHE_FROM: bunkerweb-latest - DOCKERFILE: src/bw/Dockerfile - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }} - ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }} - push-scheduler: - needs: [wait-builds] - uses: ./.github/workflows/push-docker.yml - with: - IMAGE: bunkerity/bunkerweb-scheduler:latest,bunkerity/bunkerweb-scheduler:${{ needs.wait-builds.outputs.version }} - CACHE_FROM: scheduler-latest - DOCKERFILE: src/scheduler/Dockerfile - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }} - ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }} - push-autoconf: - needs: [wait-builds] - uses: ./.github/workflows/push-docker.yml - with: - IMAGE: bunkerity/bunkerweb-autoconf:latest,bunkerity/bunkerweb-autoconf:${{ needs.wait-builds.outputs.version }} - CACHE_FROM: autoconf-latest - DOCKERFILE: src/autoconf/Dockerfile - secrets: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }} - ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }} - ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }} - push-ui: - needs: [wait-builds] - uses: ./.github/workflows/push-docker.yml - with: - IMAGE: bunkerity/bunkerweb-ui:latest,bunkerity/bunkerweb-ui:${{ needs.wait-builds.outputs.version }} - CACHE_FROM: ui-latest - DOCKERFILE: src/ui/Dockerfile + IMAGE: bunkerity/${{ matrix.image }}:${{ matrix.release }},bunkerity/${{ matrix.image }}:${{ needs.wait-builds.outputs.version }} + CACHE_FROM: ${{ matrix.cache_from }}-${{ matrix.release }} + DOCKERFILE: ${{ matrix.dockerfile }} 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 }} # Push Linux packages - push-ubuntu: + push-packages: needs: [wait-builds] + strategy: + matrix: + linux: [ubuntu, debian, fedora, el] + arch: [amd64, arm64] + include: + - release: latest + repo: bunkerweb + - linux: ubuntu + separator: _ + suffix: "" + version: jammy + package: deb + - linux: debian + separator: _ + suffix: "" + version: bullseye + package: deb + - linux: fedora + separator: "-" + suffix: "1." + version: 38 + package: rpm + - linux: el + separator: "-" + suffix: "1." + version: 8 + package: rpm + - linux: ubuntu + arch: amd64 + package_arch: amd64 + - linux: debian + arch: amd64 + package_arch: amd64 + - linux: fedora + arch: amd64 + package_arch: x86_64 + - linux: el + 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 uses: ./.github/workflows/push-packagecloud.yml with: - SEPARATOR: _ - SUFFIX: amd64 - REPO: bunkerweb - LINUX: ubuntu - VERSION: jammy - PACKAGE: deb - BW_VERSION: ${{ needs.wait-builds.outputs.version }} - secrets: - PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} - push-debian: - needs: [wait-builds] - uses: ./.github/workflows/push-packagecloud.yml - with: - SEPARATOR: _ - SUFFIX: amd64 - REPO: bunkerweb - LINUX: debian - VERSION: bullseye - PACKAGE: deb - BW_VERSION: ${{ needs.wait-builds.outputs.version }} - secrets: - PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} - push-rhel: - needs: [wait-builds] - uses: ./.github/workflows/push-packagecloud.yml - with: - SEPARATOR: "-" - SUFFIX: 1.x86_64 - REPO: bunkerweb - LINUX: el - VERSION: 8 - PACKAGE: rpm - BW_VERSION: ${{ needs.wait-builds.outputs.version }} - secrets: - PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} - push-fedora: - needs: [wait-builds] - uses: ./.github/workflows/push-packagecloud.yml - with: - SEPARATOR: "-" - SUFFIX: 1.x86_64 - REPO: bunkerweb - LINUX: fedora - VERSION: 37 - PACKAGE: rpm - BW_VERSION: ${{ needs.wait-builds.outputs.version }} + SEPARATOR: ${{ matrix.separator }} + SUFFIX: ${{ matrix.suffix }} + REPO: ${{ matrix.repo }} + LINUX: ${{ matrix.linux }} + VERSION: ${{ matrix.version }} + PACKAGE: ${{ matrix.package }} + BW_VERSION: ${{ matrix.package == 'rpm' && needs.wait-builds.outputs.versionrpm || needs.wait-builds.outputs.version }} + PACKAGE_ARCH: ${{ matrix.package_arch }} + ARCH: ${{ matrix.arch }} secrets: PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} # Create doc PDF doc-pdf: - needs: [ - wait-builds, - push-bunkerweb, - push-scheduler, - push-autoconf, - push-ui, - push-ubuntu, - push-debian, - push-rhel, - push-fedora - ] + needs: [wait-builds, push-images, push-packages] uses: ./.github/workflows/doc-to-pdf.yml with: VERSION: ${{ needs.wait-builds.outputs.version }} @@ -370,6 +252,7 @@ jobs: needs: [wait-builds, doc-pdf] permissions: contents: write + discussions: write uses: ./.github/workflows/push-github.yml with: VERSION: ${{ needs.wait-builds.outputs.version }} @@ -384,55 +267,17 @@ jobs: with: VERSION: ${{ needs.wait-builds.outputs.version }} ALIAS: latest + secrets: + BUNKERBOT_TOKEN: ${{ secrets.BUNKERBOT_TOKEN }} - # Update Docker Hub description - update-docker-hub: - needs: [ - push-bunkerweb, - push-scheduler, - push-autoconf, - push-ui - ] - permissions: - contents: write - steps: - - uses: actions/checkout@v3 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - - name: Update Docker Hub description for BW - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - repository: bunkerity/bunkerweb - readme-filepath: ./README.md - - name: Update Docker Hub description for scheduler - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - repository: bunkerity/bunkerweb-scheduler - readme-filepath: ./README.md - - name: Update Docker Hub description for autoconf - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - repository: bunkerity/bunkerweb-autoconf - readme-filepath: ./README.md - - name: Update Docker Hub description for UI - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_TOKEN }} - repository: bunkerity/bunkerweb-ui - readme-filepath: ./README.md - - - - - - + # 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 }} \ No newline at end of file diff --git a/README.md b/README.md index 9004a0020..000125e16 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@

- BunkerWeb logo + BunkerWeb logo

@@ -17,7 +17,7 @@ | 👨‍💻 Demo | - 🛡️ Examples + 🛡️ Examples | 💬 Chat | @@ -33,14 +33,14 @@ # BunkerWeb

- overview + overview

BunkerWeb is a next-generation and open-source Web Application Firewall (WAF). -Being a full-featured web server (based on [NGINX](https://nginx.org/) under the hood), it will protect your web services to make them "secure by default". BunkerWeb integrates seamlessly into your existing environments ([Linux](https://docs.bunkerweb.io/1.5.0-beta/integrations/#linux), [Docker](https://docs.bunkerweb.io/1.5.0-beta/integrations/#docker), [Swarm](https://docs.bunkerweb.io/1.5.0-beta/integrations/#swarm), [Kubernetes](https://docs.bunkerweb.io/1.5.0-beta/integrations/#kubernetes), …) and is fully configurable (don't panic, there is an [awesome web UI](https://docs.bunkerweb.io/1.5.0-beta/web-ui/) if you don't like the CLI) to meet your own use-cases . In other words, cybersecurity is no more a hassle. +Being a full-featured web server (based on [NGINX](https://nginx.org/) under the hood), it will protect your web services to make them "secure by default". BunkerWeb integrates seamlessly into your existing environments ([Linux](https://docs.bunkerweb.io/1.5.0/integrations/#linux), [Docker](https://docs.bunkerweb.io/1.5.0/integrations/#docker), [Swarm](https://docs.bunkerweb.io/1.5.0/integrations/#swarm), [Kubernetes](https://docs.bunkerweb.io/1.5.0/integrations/#kubernetes), …) and is fully configurable (don't panic, there is an [awesome web UI](https://docs.bunkerweb.io/1.5.0/web-ui/) if you don't like the CLI) to meet your own use-cases . In other words, cybersecurity is no more a hassle. -BunkerWeb contains primary [security features](https://docs.bunkerweb.io/1.5.0-beta/security-tuning/) as part of the core but can be easily extended with additional ones thanks to a [plugin system](https://docs.bunkerweb.io/1.5.0-beta/plugins/)). +BunkerWeb contains primary [security features](https://docs.bunkerweb.io/1.5.0/security-tuning/) as part of the core but can be easily extended with additional ones thanks to a [plugin system](https://docs.bunkerweb.io/1.5.0/plugins/)). ## Why BunkerWeb ? @@ -64,7 +64,7 @@ A non-exhaustive list of security features : - **Block known bad IPs** with external blacklists and DNSBL - And much more ... -Learn more about the core security features in the [security tuning](https://docs.bunkerweb.io/1.5.0-beta/security-tuning/) section of the documentation. +Learn more about the core security features in the [security tuning](https://docs.bunkerweb.io/1.5.0/security-tuning/) section of the documentation. ## Demo @@ -77,10 +77,10 @@ A demo website protected with BunkerWeb is available at [demo.bunkerweb.io](http # Concepts

- BunkerWeb logo + BunkerWeb logo

-You will find more information about the key concepts of BunkerWeb in the [documentation](https://docs.bunkerweb.io/1.5.0-beta/concepts). +You will find more information about the key concepts of BunkerWeb in the [documentation](https://docs.bunkerweb.io/1.5.0/concepts). ## Integrations @@ -88,13 +88,13 @@ The first concept is the integration of BunkerWeb into the target environment. W The following integrations are officially supported : -- [Docker](https://docs.bunkerweb.io/1.5.0-beta/integrations/#docker) -- [Docker autoconf](https://docs.bunkerweb.io/1.5.0-beta/integrations/#docker-autoconf) -- [Swarm](https://docs.bunkerweb.io/1.5.0-beta/integrations/#swarm) -- [Kubernetes](https://docs.bunkerweb.io/1.5.0-beta/integrations/#kubernetes) -- [Linux](https://docs.bunkerweb.io/1.5.0-beta/integrations/#linux) -- [Ansible](https://docs.bunkerweb.io/1.5.0-beta/integrations/#ansible) -- [Vagrant](https://docs.bunkerweb.io/1.5.0-beta/integrations/#vagrant) +- [Docker](https://docs.bunkerweb.io/1.5.0/integrations/#docker) +- [Docker autoconf](https://docs.bunkerweb.io/1.5.0/integrations/#docker-autoconf) +- [Swarm](https://docs.bunkerweb.io/1.5.0/integrations/#swarm) +- [Kubernetes](https://docs.bunkerweb.io/1.5.0/integrations/#kubernetes) +- [Linux](https://docs.bunkerweb.io/1.5.0/integrations/#linux) +- [Ansible](https://docs.bunkerweb.io/1.5.0/integrations/#ansible) +- [Vagrant](https://docs.bunkerweb.io/1.5.0/integrations/#vagrant) ## Settings @@ -126,7 +126,7 @@ When multisite mode is enabled, BunkerWeb will serve and protect multiple web ap ## Custom configurations -Because meeting all the use cases only using the settings is not an option (even with [external plugins](https://docs.bunkerweb.io/1.5.0-beta/plugins)), you can use custom configurations to solve your specific challenges. +Because meeting all the use cases only using the settings is not an option (even with [external plugins](https://docs.bunkerweb.io/1.5.0/plugins)), you can use custom configurations to solve your specific challenges. Under the hood, BunkerWeb uses the notorious NGINX web server, that's why you can leverage its configuration system for your specific needs. Custom NGINX configurations can be included in different [contexts](https://docs.nginx.com/nginx/admin-guide/basic-functionality/managing-configuration-files/#contexts) like HTTP or server (all servers and/or specific server block). @@ -160,7 +160,7 @@ In other words, the scheduler is the brain of BunkerWeb. ## Docker

- Docker + Docker

We provide ready to use prebuilt images for x64, x86, armv7 and arm64 platforms on [Docker Hub](https://hub.docker.com/u/bunkerity). @@ -171,46 +171,46 @@ Docker integration key concepts are : - **Scheduler** container to store configuration and execute jobs - **Networks** to expose ports for clients and connect to upstream web services -You will find more information in the [Docker integration section](https://docs.bunkerweb.io/1.5.0-beta/integrations/#docker) of the documentation. +You will find more information in the [Docker integration section](https://docs.bunkerweb.io/1.5.0/integrations/#docker) of the documentation. ## Docker autoconf

- Docker autoconf + Docker autoconf

The downside of using environment variables is that the container needs to be recreated each time there is an update which is not very convenient. To counter that issue, you can use another image called **autoconf** which will listen for Docker events and automatically reconfigure BunkerWeb in real-time without recreating the container. Instead of defining environment variables for the BunkerWeb container, you simply add **labels** to your web applications containers and the **autoconf** will "automagically" take care of the rest. -You will find more information in the [Docker autoconf section](https://docs.bunkerweb.io/1.5.0-beta/integrations/#docker-autoconf) of the documentation. +You will find more information in the [Docker autoconf section](https://docs.bunkerweb.io/1.5.0/integrations/#docker-autoconf) of the documentation. ## Swarm

- Swarm + Swarm

To automatically configure BunkerWeb instances, a special service, called **autoconf** will listen for Docker Swarm events like service creation or deletion and automatically configure the **BunkerWeb instances** in real-time without downtime. -Like the [Docker autoconf integration](https://docs.bunkerweb.io/1.5.0-beta/integrations/#docker-autoconf), configuration for web services is defined using labels starting with the special **bunkerweb.** prefix. +Like the [Docker autoconf integration](https://docs.bunkerweb.io/1.5.0/integrations/#docker-autoconf), configuration for web services is defined using labels starting with the special **bunkerweb.** prefix. -You will find more information in the [Swarm section](https://docs.bunkerweb.io/1.5.0-beta/integrations/#swarm) of the documentation. +You will find more information in the [Swarm section](https://docs.bunkerweb.io/1.5.0/integrations/#swarm) of the documentation. ## Kubernetes

- Kubernetes + Kubernetes

The autoconf acts as an [Ingress controller](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/) and will configure the BunkerWeb instances according to the [Ingress resources](https://kubernetes.io/docs/concepts/services-networking/ingress/). It also monitors other Kubernetes objects like [ConfigMap](https://kubernetes.io/docs/concepts/configuration/configmap/) for custom configurations. -You will find more information in the [Kubernetes section](https://docs.bunkerweb.io/1.5.0-beta/integrations/#kubernetes) of the documentation. +You will find more information in the [Kubernetes section](https://docs.bunkerweb.io/1.5.0/integrations/#kubernetes) of the documentation. ## Linux

- Linux + Linux

List of supported Linux distros : @@ -222,12 +222,12 @@ List of supported Linux distros : Repositories of Linux packages for BunkerWeb are available on [PackageCloud](https://packagecloud.io/bunkerity/bunkerweb), they provide a bash script to automatically add and trust the repository (but you can also follow the [manual installation](https://packagecloud.io/bunkerity/bunkerweb/install) instructions if you prefer). -You will find more information in the [Linux section](https://docs.bunkerweb.io/1.5.0-beta/integrations/#linux) of the documentation. +You will find more information in the [Linux section](https://docs.bunkerweb.io/1.5.0/integrations/#linux) of the documentation. ## Ansible

- Ansible + Ansible

List of supported Linux distros : @@ -241,7 +241,7 @@ List of supported Linux distros : A specific BunkerWeb Ansible role is available on [Ansible Galaxy](https://galaxy.ansible.com/bunkerity/bunkerweb) (source code is available [here](https://github.com/bunkerity/bunkerweb-ansible)). -You will find more information in the [Ansible section](https://docs.bunkerweb.io/1.5.0-beta/integrations/#ansible) of the documentation. +You will find more information in the [Ansible section](https://docs.bunkerweb.io/1.5.0/integrations/#ansible) of the documentation. ## Vagrant @@ -251,11 +251,11 @@ We maintain ready to use Vagrant boxes hosted on Vagrant cloud for the following - virtualbox - libvirt -You will find more information in the [Vagrant section](https://docs.bunkerweb.io/1.5.0-beta/integrations/#vagrant) of the documentation. +You will find more information in the [Vagrant section](https://docs.bunkerweb.io/1.5.0/integrations/#vagrant) of the documentation. # Quickstart guide -Once you have setup BunkerWeb with the integration of your choice, you can follow the [quickstart guide](https://docs.bunkerweb.io/1.5.0-beta/quickstart-guide/) that will cover the following common use cases : +Once you have setup BunkerWeb with the integration of your choice, you can follow the [quickstart guide](https://docs.bunkerweb.io/1.5.0/quickstart-guide/) that will cover the following common use cases : - Protecting a single HTTP application - Protecting multiple HTTP application @@ -266,9 +266,9 @@ Once you have setup BunkerWeb with the integration of your choice, you can follo # Security tuning -BunkerWeb offers many security features that you can configure with [settings](https://docs.bunkerweb.io/1.5.0-beta/settings). Even if the default values of settings ensure a minimal "security by default", we strongly recommend you to tune them. By doing so you will be able to ensure a security level of your choice but also manage false positives. +BunkerWeb offers many security features that you can configure with [settings](https://docs.bunkerweb.io/1.5.0/settings). Even if the default values of settings ensure a minimal "security by default", we strongly recommend you to tune them. By doing so you will be able to ensure a security level of your choice but also manage false positives. -You will find more information in the [security tuning section](https://docs.bunkerweb.io/1.5.0-beta/security-tuning) of the documentation. +You will find more information in the [security tuning section](https://docs.bunkerweb.io/1.5.0/security-tuning) of the documentation. # Settings @@ -278,7 +278,7 @@ As a general rule when multisite mode is enabled, if you want to apply settings When settings are considered as "multiple", it means that you can have multiple groups of settings for the same feature by adding numbers as suffix like `REVERSE_PROXY_URL_1=/subdir`, `REVERSE_PROXY_HOST_1=http://myhost1`, `REVERSE_PROXY_URL_2=/anotherdir`, `REVERSE_PROXY_HOST_2=http://myhost2`, ... for example. -Check the [settings section](https://docs.bunkerweb.io/1.5.0-beta/settings) of the documentation to get the full list. +Check the [settings section](https://docs.bunkerweb.io/1.5.0/settings) of the documentation to get the full list. # Web UI @@ -296,7 +296,7 @@ The "Web UI" is a web application that helps you manage your BunkerWeb instance - Monitor jobs execution - View the logs and search pattern -You will find more information in the [Web UI section](https://docs.bunkerweb.io/1.5.0-beta/web-ui) of the documentation. +You will find more information in the [Web UI section](https://docs.bunkerweb.io/1.5.0/web-ui) of the documentation. # Plugins @@ -312,7 +312,7 @@ Here is the list of "official" plugins that we maintain (see the [bunkerweb-plug | **Slack** | 0.1 | Send security notifications to a Slack channel using a Webhook. | [bunkerweb-plugins/slack](https://github.com/bunkerity/bunkerweb-plugins/tree/main/slack) | | **VirusTotal** | 0.1 | Automatically scans uploaded files with the VirusTotal API and denies the request when a file is detected as malicious. | [bunkerweb-plugins/virustotal](https://github.com/bunkerity/bunkerweb-plugins/tree/main/virustotal) | -You will find more information in the [plugins section](https://docs.bunkerweb.io/1.5.0-beta/plugins) of the documentation. +You will find more information in the [plugins section](https://docs.bunkerweb.io/1.5.0/plugins) of the documentation. # Support @@ -340,12 +340,12 @@ Please don't use [GitHub issues](https://github.com/bunkerity/bunkerweb/issues) # License -This project is licensed under the terms of the [GNU Affero General Public License (AGPL) version 3](https://github.com/bunkerity/bunkerweb/tree/1.5.0-beta/LICENSE.md). +This project is licensed under the terms of the [GNU Affero General Public License (AGPL) version 3](https://github.com/bunkerity/bunkerweb/tree/1.5.0/LICENSE.md). # Contribute -If you would like to contribute to the plugins you can read the [contributing guidelines](https://github.com/bunkerity/bunkerweb/tree/1.5.0-beta/CONTRIBUTING.md) to get started. +If you would like to contribute to the plugins you can read the [contributing guidelines](https://github.com/bunkerity/bunkerweb/tree/1.5.0/CONTRIBUTING.md) to get started. # Security policy -We take security bugs as serious issues and encourage responsible disclosure, see our [security policy](https://github.com/bunkerity/bunkerweb/tree/1.5.0-beta/SECURITY.md) for more information. \ No newline at end of file +We take security bugs as serious issues and encourage responsible disclosure, see our [security policy](https://github.com/bunkerity/bunkerweb/tree/1.5.0/SECURITY.md) for more information. \ No newline at end of file diff --git a/docs/assets/img/concepts.svg b/docs/assets/img/concepts.svg index 7a997c2aa..be2c113cb 100644 --- a/docs/assets/img/concepts.svg +++ b/docs/assets/img/concepts.svg @@ -1,4 +1 @@ - - - -
Integrations
Integrations
Settings and
configurations
Settings and...
Multisite
Multisite
INCOMING TRAFFIC
INCOMING TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
Text is not SVG - cannot display
\ No newline at end of file + \ No newline at end of file diff --git a/docs/assets/img/core-order.svg b/docs/assets/img/core-order.svg index 6b2f0bce6..ec55e3956 100755 --- a/docs/assets/img/core-order.svg +++ b/docs/assets/img/core-order.svg @@ -1,4 +1,86 @@ - - - -
ACCESS
BEGIN
ACCESS...
WHITELISTED ?
WHITELISTED ?
ALREADY
BANNED ?
ALREADY...
BLACKLISTED ?
BLACKLISTED ?
GREYLISTED ?
GREYLISTED ?
COUNTRY
BANNED ?
COUNTRY...
LISTED IN
DNSBL ?
LISTED IN...
LISTED IN
BUNKERNET ?
LISTED IN...
RATE
LIMITED ?
RATE...
ANTIBOT CHECK
NEEDED ?
ANTIBOT CHECK...
ACCESS
END
ACCESS...
SEND
CHALLENGE
SEND...
PROCESS
REQUEST
PROCESS...
DENY
REQUEST
DENY...
ALLOW
REQUEST
ALLOW...
NO
NO
NO
NO
NO
NO
YES
YES
NO
NO
NO
NO
NO
NO
NO
NO
YES
YES
NO
NO
YES
YES
YES
YES
YES
YES
NO
NO
YES
YES
YES
YES
YES
YES
YES
YES
Text is not SVG - cannot display
\ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/assets/img/integration-autoconf.svg b/docs/assets/img/integration-autoconf.svg index 564ff9240..05e6865a1 100644 --- a/docs/assets/img/integration-autoconf.svg +++ b/docs/assets/img/integration-autoconf.svg @@ -1,4 +1 @@ - - - -
INCOMING TRAFFIC
INCOMING TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
Docker API
Docker API
BUNKERWEB-AUTOCONF
BUNKERWEB-AUTOCONF
Dynamically generate configuration
Dynamically generate conf...
Read events
Read events
Text is not SVG - cannot display
\ No newline at end of file + \ No newline at end of file diff --git a/docs/assets/img/integration-docker.svg b/docs/assets/img/integration-docker.svg index 61f91891f..080fa3f60 100644 --- a/docs/assets/img/integration-docker.svg +++ b/docs/assets/img/integration-docker.svg @@ -1,4 +1 @@ - - - -
Environment variables
Environment variable...
Volume
Volume
Networks
Networks
INCOMING TRAFFIC
INCOMING TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
Text is not SVG - cannot display
\ No newline at end of file + \ No newline at end of file diff --git a/docs/assets/img/integration-kubernetes.svg b/docs/assets/img/integration-kubernetes.svg index 46242eaee..46c50492e 100644 --- a/docs/assets/img/integration-kubernetes.svg +++ b/docs/assets/img/integration-kubernetes.svg @@ -1,4 +1 @@ - - - -
CONTROL PLANE
CONTROL PLANE
NODE #1
NODE #1
NODE #2
NODE #2
NODE #N
NODE #N
INCOMING TRAFFIC
INCOMING TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
BUNKERWEB
BUNKERWEB
WEB SERVICE
WEB SERVICE
BUNKERWEB
BUNKERWEB
BUNKERWEB-AUTOCONF
BUNKERWEB-AUTOCONF
BUNKERWEB
BUNKERWEB
WEB SERVICE
WEB SERVICE
Kubernetes API
Kubernetes API
Read events, ingress and configmap
Read events, ingress and...
Dynamically generate configuration
Dynamically generate...
Dynamically generate configuration
Dynamically generate...
Ingress
Ingress
ConfigMap
ConfigMap
Define rules for web services
Define rules for web...
Define custom configuration
Define custom config...
Text is not SVG - cannot display
\ No newline at end of file + \ No newline at end of file diff --git a/docs/assets/img/integration-swarm.svg b/docs/assets/img/integration-swarm.svg index c4b75fcdb..a7e4879ac 100644 --- a/docs/assets/img/integration-swarm.svg +++ b/docs/assets/img/integration-swarm.svg @@ -1,4 +1 @@ - - - -
WORKER #1
WORKER #1
WORKER #2
WORKER #2
WORKER #N
WORKER #N
MANAGER
MANAGER
INCOMING TRAFFIC
INCOMING TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
INTERNAL TRAFFIC
BUNKERWEB-AUTOCONF
BUNKERWEB-AUTOCONF
BUNKERWEB
BUNKERWEB
WEB SERVICE
WEB SERVICE
BUNKERWEB
BUNKERWEB
WEB SERVICE
WEB SERVICE
BUNKERWEB
BUNKERWEB
WEB SERVICE
WEB SERVICE
Docker API
Docker API
Dynamically generate configuration
Dynamically generate conf...
Read events
Read events
Text is not SVG - cannot display
\ No newline at end of file + \ No newline at end of file diff --git a/docs/concepts.md b/docs/concepts.md index 6ee280e57..9237d4a0f 100644 --- a/docs/concepts.md +++ b/docs/concepts.md @@ -79,7 +79,7 @@ app3.example.com_USE_BAD_BEHAVIOR=no !!! info "Going further" - You will find concrete examples of multisite mode in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/examples) directory of the repository. + You will find concrete examples of multisite mode in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/examples) directory of the repository. ## Custom configurations @@ -91,7 +91,7 @@ Another core component of BunkerWeb is the ModSecurity Web Application Firewall !!! info "Going further" - You will find concrete examples of custom configurations in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/examples) directory of the repository. + You will find concrete examples of custom configurations in the [quickstart guide](quickstart-guide.md) of the documentation and the [examples](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/examples) directory of the repository. ## Database diff --git a/docs/integrations.md b/docs/integrations.md index b640fba6d..d640e80bb 100644 --- a/docs/integrations.md +++ b/docs/integrations.md @@ -3,7 +3,7 @@ ## Docker
- ![Overview](assets/img/integration-docker.svg){ align=center } + ![Overview](assets/img/integration-docker.svg){ align=center, width="600" }
Docker integration
@@ -12,7 +12,7 @@ Using BunkerWeb as a [Docker](https://www.docker.com/) container is a quick and We provide ready-to-use prebuilt images for x64, x86 armv8 and armv7 architectures on [Docker Hub](https://hub.docker.com/r/bunkerity/bunkerweb) : ```shell -docker pull bunkerity/bunkerweb:1.5.0-beta +docker pull bunkerity/bunkerweb:1.5.0 ``` Alternatively, you can build the Docker image directly from the [source](https://github.com/bunkerity/bunkerweb) (and get a coffee ☕ because it may take a long time depending on your hardware) : @@ -30,7 +30,7 @@ Docker integration key concepts are : - **Networks** to expose ports for clients and connect to upstream web services !!! info "Database backend" - Please note that we assume you are using SQLite as database backend (which is the default for the `DATABASE_URI` setting). Other backends for this integration are still possible if you want to : see docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) folder of the repostiory for more information. + Please note that we assume you are using SQLite as database backend (which is the default for the `DATABASE_URI` setting). Other backends for this integration are still possible if you want to : see docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) folder of the repostiory for more information. ### Environment variables @@ -40,7 +40,7 @@ Settings are passed to BunkerWeb using Docker environment variables : ... services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 labels: - "bunkerweb.INSTANCE" environment: @@ -59,7 +59,7 @@ Please note that the `bunkerweb.INSTANCE` is mandatory to make sure the schedule The [scheduler](concepts.md#scheduler) is executed in its own container which is also available on Docker Hub : ```shell -docker pull bunkerity/bunkerweb-scheduler:1.5.0-beta +docker pull bunkerity/bunkerweb-scheduler:1.5.0 ``` Alternatively, you can build the Docker image directly from the [source](https://github.com/bunkerity/bunkerweb) (less coffee ☕ needed than BunkerWeb image) : @@ -76,7 +76,7 @@ A volume is needed to store the SQLite database that will be used by the schedul ... services: mybunker: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 volumes: - bw-data:/data ... @@ -138,7 +138,7 @@ You will need to create the Docker API proxy container, mount the socket and set ... services: bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 env: - DOCKER_HOST=tcp://bw-docker:2375 ... @@ -185,7 +185,7 @@ The scheduler needs to contact the API of BunkerWeb and for obvious security rea ... services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -194,7 +194,7 @@ services: - bw-universe ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 networks: - bw-universe - bw-docker @@ -224,7 +224,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -238,7 +238,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -278,7 +278,7 @@ networks: ## Docker autoconf
- ![Overview](assets/img/integration-autoconf.svg){ align=center } + ![Overview](assets/img/integration-autoconf.svg){ align=center, width="600" }
Docker autoconf integration
@@ -293,7 +293,7 @@ Instead of defining environment variables for the BunkerWeb container, you simpl The Docker autoconf integration implies the use of **multisite mode**. Please refer to the [multisite section](concepts.md#multisite-mode) of the documentation for more information. !!! info "Database backend" - Please note that we assume you are using MariaDB as database backend (which is defined using the `DATABASE_URI` setting). Other backends for this integration are still possible if you want : see docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) folder of the repostiory for more information. + Please note that we assume you are using MariaDB as database backend (which is defined using the `DATABASE_URI` setting). Other backends for this integration are still possible if you want : see docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) folder of the repostiory for more information. Another container, named `bw-autoconf` for example, containing the autoconf service must be added to the stack. Since two services will generate the configuration for BunkerWeb, a "real" database backend (in other words, not SQLite) also needs to be added : @@ -302,7 +302,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -319,7 +319,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -332,7 +332,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -409,7 +409,7 @@ networks: ## Swarm
- ![Overview](assets/img/integration-swarm.svg){ align=center } + ![Overview](assets/img/integration-swarm.svg){ align=center, width="600" }
Docker Swarm integration
@@ -427,7 +427,7 @@ Since we have multiple instances of BunkerWeb running, a shared data store imple Using a shared folder or a specific driver for the database volume is left as an exercise for the reader (and depends on your own use-case). !!! info "Database backend" - Please note that we assume you are using MariaDB as database backend (which is defined using the `DATABASE_URI` setting). Other backends for this integration are still possible if you want : see docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) folder of the repostiory for more information. Clustered database backends setup are out-of-the-scope of this documentation. + Please note that we assume you are using MariaDB as database backend (which is defined using the `DATABASE_URI` setting). Other backends for this integration are still possible if you want : see docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) folder of the repostiory for more information. Clustered database backends setup are out-of-the-scope of this documentation. Here is the stack boilerplate that you can deploy using `docker stack deploy` : @@ -436,7 +436,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -466,7 +466,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -497,7 +497,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -585,7 +585,7 @@ networks: ## Kubernetes
- ![Overview](assets/img/integration-kubernetes.svg){ align=center } + ![Overview](assets/img/integration-kubernetes.svg){ align=center, width="600" }
Kubernetes integration
@@ -596,7 +596,7 @@ The recommended setup is to define **BunkerWeb** as a **[DaemonSet](https://kube Since we have multiple instances of BunkerWeb running, a shared data store implemented as a [Redis](https://redis.io/) service must be created : the instances will use it to cache and share data. You will find more information about the Redis settings [here](settings.md#redis) !!! info "Database backend" - Please note that we assume you are using MariaDB as database backend (which is defined using the `DATABASE_URI` setting). Other backends for this integration are still possible if you want : see yaml files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) folder of the repostiory for more information. Clustered database backends setup are out-of-the-scope of this documentation. + Please note that we assume you are using MariaDB as database backend (which is defined using the `DATABASE_URI` setting). Other backends for this integration are still possible if you want : see yaml files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) folder of the repostiory for more information. Clustered database backends setup are out-of-the-scope of this documentation. Please note that both scheduler and autoconf services needs to access the Kubernetes API. The recommended way of doing it is using [RBAC authorization](https://kubernetes.io/docs/reference/access-authn-authz/rbac/). @@ -655,7 +655,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -725,7 +725,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -752,7 +752,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -895,7 +895,7 @@ spec: ## Linux
- ![Overview](assets/img/integration-linux.svg){ align=center } + ![Overview](assets/img/integration-linux.svg){ align=center, width="600" }
Linux integration
@@ -930,12 +930,12 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt sudo apt install -y nginx=1.24.0-1~$(lsb_release -cs) ``` - And finally install BunkerWeb 1.5.0-beta : + And finally install BunkerWeb 1.5.0 : ```shell curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \ sudo apt update && \ - sudo apt install -y bunkerweb=1.5.0-beta + sudo apt install -y bunkerweb=1.5.0 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command : @@ -964,12 +964,12 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt sudo apt install -y nginx=1.24.0-1~jammy ``` - And finally install BunkerWeb 1.5.0-beta : + And finally install BunkerWeb 1.5.0 : ```shell curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.deb.sh | sudo bash && \ sudo apt update && \ - sudo apt install -y bunkerweb=1.5.0-beta + sudo apt install -y bunkerweb=1.5.0 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `apt upgrade`, you can use the following command : @@ -986,14 +986,14 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt sudo dnf install -y nginx-1.24.0 ``` - And finally install BunkerWeb 1.5.0_beta : + And finally install BunkerWeb 1.5.0 : ```shell curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | \ sed 's/yum install -y pygpgme --disablerepo='\''bunkerity_bunkerweb'\''/yum install -y python-gnupg/g' | \ sed 's/pypgpme_check=`rpm -qa | grep -qw pygpgme`/python-gnupg_check=`rpm -qa | grep -qw python-gnupg`/g' | sudo bash && \ sudo dnf makecache && \ - sudo dnf install -y bunkerweb-1.5.0-beta + sudo dnf install -y bunkerweb-1.5.0 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command : @@ -1030,13 +1030,13 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt ```shell sudo dnf install nginx-1.24.0 ``` - And finally install BunkerWeb 1.5.0-beta : + And finally install BunkerWeb 1.5.0 : ```shell dnf install -y epel-release && \ curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | sudo bash && \ sudo dnf check-update && \ - sudo dnf install -y bunkerweb-1.5.0_beta + sudo dnf install -y bunkerweb-1.5.0 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command : @@ -1065,12 +1065,12 @@ Repositories of Linux packages for BunkerWeb are available on [PackageCloud](htt sudo dnf install nginx-1.24.0 ``` - And finally install BunkerWeb 1.5.0-beta : + And finally install BunkerWeb 1.5.0 : ```shell dnf install -y epel-release && \ curl -s https://packagecloud.io/install/repositories/bunkerity/bunkerweb/script.rpm.sh | sudo bash && \ sudo dnf check-update && \ - sudo dnf install -y bunkerweb-1.5.0-beta + sudo dnf install -y bunkerweb-1.5.0 ``` To prevent upgrading NGINX and/or BunkerWeb packages when executing `dnf upgrade`, you can use the following command : @@ -1161,7 +1161,7 @@ BunkerWeb is managed using systemctl : ## Ansible
- ![Overview](assets/img/integration-ansible.svg){ align=center } + ![Overview](assets/img/integration-ansible.svg){ align=center, width="600" }
Ansible integration
@@ -1209,7 +1209,7 @@ Configuration of BunkerWeb is done by using specific role variables : | Name | Type | Description | Default value | |:-----:|:-----:|--------------|----------------| -| `bunkerweb_version` | string | Version of BunkerWeb to install. | `1.5.0-beta` | +| `bunkerweb_version` | string | Version of BunkerWeb to install. | `1.5.0` | | `nginx_version` | string | Version of NGINX to install. | `1.24.0` | | `freeze_versions` | boolean | Prevent upgrade of BunkerWeb and NGINX when performing packages upgrades. | `true` | | `variables_env` | string | Path of the variables.env file to configure BunkerWeb. | `files/variables.env` | diff --git a/docs/migrating.md b/docs/migrating.md index da2625c1b..efccfaf64 100644 --- a/docs/migrating.md +++ b/docs/migrating.md @@ -2,7 +2,7 @@ !!! warning "Read this if you were a 1.4.X user" - A lot of things changed since the 1.4.X releases. Container-based integrations stacks contain more services but, trust us, fundamental principles of BunkerWeb are still there. You will find ready to use boilerplates for various integrations in the [misc/integrations](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) folder of the repository. + A lot of things changed since the 1.4.X releases. Container-based integrations stacks contain more services but, trust us, fundamental principles of BunkerWeb are still there. You will find ready to use boilerplates for various integrations in the [misc/integrations](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) folder of the repository. ## Scheduler diff --git a/docs/plugins.md b/docs/plugins.md index ab343dc26..2cb10eeb9 100644 --- a/docs/plugins.md +++ b/docs/plugins.md @@ -8,11 +8,11 @@ Here is the list of "official" plugins that we maintain (see the [bunkerweb-plug | Name | Version | Description | Link | | :------------: | :-----: | :------------------------------------------------------------------------------------------------------------------------------- | :---------------------------------------------------------------------------------------------------: | -| **ClamAV** | 0.1 | Automatically scans uploaded files with the ClamAV antivirus engine and denies the request when a file is detected as malicious. | [bunkerweb-plugins/clamav](https://github.com/bunkerity/bunkerweb-plugins/tree/main/clamav) | -| **CrowdSec** | 0.1 | CrowdSec bouncer for BunkerWeb. | [bunkerweb-plugins/crowdsec](https://github.com/bunkerity/bunkerweb-plugins/tree/main/crowdsec) | -| **Discord** | 0.1 | Send security notifications to a Discord channel using a Webhook. | [bunkerweb-plugins/discord](https://github.com/bunkerity/bunkerweb-plugins/tree/main/discord) | -| **Slack** | 0.1 | Send security notifications to a Slack channel using a Webhook. | [bunkerweb-plugins/slack](https://github.com/bunkerity/bunkerweb-plugins/tree/main/slack) | -| **VirusTotal** | 0.1 | Automatically scans uploaded files with the VirusTotal API and denies the request when a file is detected as malicious. | [bunkerweb-plugins/virustotal](https://github.com/bunkerity/bunkerweb-plugins/tree/main/virustotal) | +| **ClamAV** | 1.0 | Automatically scans uploaded files with the ClamAV antivirus engine and denies the request when a file is detected as malicious. | [bunkerweb-plugins/clamav](https://github.com/bunkerity/bunkerweb-plugins/tree/main/clamav) | +| **CrowdSec** | 1.0 | CrowdSec bouncer for BunkerWeb. | [bunkerweb-plugins/crowdsec](https://github.com/bunkerity/bunkerweb-plugins/tree/main/crowdsec) | +| **Discord** | 1.0 | Send security notifications to a Discord channel using a Webhook. | [bunkerweb-plugins/discord](https://github.com/bunkerity/bunkerweb-plugins/tree/main/discord) | +| **Slack** | 1.0 | Send security notifications to a Slack channel using a Webhook. | [bunkerweb-plugins/slack](https://github.com/bunkerity/bunkerweb-plugins/tree/main/slack) | +| **VirusTotal** | 1.0 | Automatically scans uploaded files with the VirusTotal API and denies the request when a file is detected as malicious. | [bunkerweb-plugins/virustotal](https://github.com/bunkerity/bunkerweb-plugins/tree/main/virustotal) | ## How to use a plugin @@ -20,7 +20,7 @@ Here is the list of "official" plugins that we maintain (see the [bunkerweb-plug If you want to quickly install external plugins, you can use the `EXTERNAL_PLUGIN_URLS` setting. It takes a list of URLs, separated with space, pointing to compressed (zip format) archive containing one or more plugin(s). -You can use the following value if you want to automatically install the official plugins : `EXTERNAL_PLUGIN_URLS=https://github.com/bunkerity/bunkerweb-plugins/archive/refs/tags/v0.2.zip` +You can use the following value if you want to automatically install the official plugins : `EXTERNAL_PLUGIN_URLS=https://github.com/bunkerity/bunkerweb-plugins/archive/refs/tags/v1.0.zip` ### Manual @@ -28,7 +28,7 @@ The first step is to install the plugin by putting the plugin files inside the c === "Docker" - When using the [Docker integration](1.5.0-beta/integrations/#docker), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. + When using the [Docker integration](integrations.md#docker), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. The first thing to do is to create the plugins folder : @@ -56,7 +56,7 @@ The first step is to install the plugin by putting the plugin files inside the c services: ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 volumes: - ./bw-data:/data ... @@ -64,7 +64,7 @@ The first step is to install the plugin by putting the plugin files inside the c === "Docker autoconf" - When using the [Docker autoconf integration](1.5.0-beta/integrations/#docker-autoconf), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. + When using the [Docker autoconf integration](integrations.md#docker-autoconf), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. The first thing to do is to create the plugins folder : @@ -93,7 +93,7 @@ The first step is to install the plugin by putting the plugin files inside the c services: ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 volumes: - ./bw-data:/data ... @@ -101,7 +101,7 @@ The first step is to install the plugin by putting the plugin files inside the c === "Swarm" - When using the [Swarm integration](1.5.0-beta/integrations/#swarm), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. + When using the [Swarm integration](integrations.md#swarm), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. !!! info "Swarm volume" Configuring a Swarm volume that will persist when the scheduler service is running on different nodes is not covered is in this documentation. We will assume that you have a shared folder mounted on `/shared` accross all nodes. @@ -132,7 +132,7 @@ The first step is to install the plugin by putting the plugin files inside the c services: ... bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 volumes: - /shared/bw-plugins:/data/plugins ... @@ -140,7 +140,7 @@ The first step is to install the plugin by putting the plugin files inside the c === "Kubernetes" - When using the [Kubernetes integration](1.5.0-beta/integrations/#kubernetes), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. + When using the [Kubernetes integration](integrations.md#kubernetes), plugins must be written to the volume mounted on `/data/plugins` into the scheduler container. The fist thing to do is to declare a [PersistentVolumeClaim](https://kubernetes.io/docs/concepts/storage/persistent-volumes/) that will contain our plugins data : @@ -179,7 +179,7 @@ The first step is to install the plugin by putting the plugin files inside the c serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -205,7 +205,7 @@ The first step is to install the plugin by putting the plugin files inside the c === "Linux" - When using the [Linux integration](1.5.0-beta/integrations/#linux), plugins must be written to the `/etc/bunkerweb/plugins` folder : + When using the [Linux integration](integrations.md#linux), plugins must be written to the `/etc/bunkerweb/plugins` folder : ```shell git clone https://github.com/bunkerity/bunkerweb-plugins && \ @@ -215,7 +215,7 @@ The first step is to install the plugin by putting the plugin files inside the c === "Ansible" - When using the [Ansible integration](1.5.0-beta/integrations/#ansible), you can use the `plugins` variable to set a local folder containing your plugins that will be copied to your BunkerWeb instances. + When using the [Ansible integration](integrations.md#ansible), you can use the `plugins` variable to set a local folder containing your plugins that will be copied to your BunkerWeb instances. Let's assume that you have plugins inside the `bunkerweb-plugins` folder : @@ -249,7 +249,7 @@ The first step is to install the plugin by putting the plugin files inside the c === "Vagrant" - When using the [Vagrant integration](1.5.0-beta/integrations/#vagrant), plugins must be written to the `/etc/bunkerweb/plugins` folder (you will need to do a `vagrant ssh` first) : + When using the [Vagrant integration](integrations.md#vagrant), plugins must be written to the `/etc/bunkerweb/plugins` folder (you will need to do a `vagrant ssh` first) : ```shell git clone https://github.com/bunkerity/bunkerweb-plugins && \ @@ -260,7 +260,7 @@ The first step is to install the plugin by putting the plugin files inside the c !!! tip "Existing plugins" - If the documentation is not enough, you can have a look at the existing source code of [official plugins](https://github.com/bunkerity/bunkerweb-plugins) and the [core plugins](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/src/common/core) (already included in BunkerWeb but they are plugins, technically speaking). + If the documentation is not enough, you can have a look at the existing source code of [official plugins](https://github.com/bunkerity/bunkerweb-plugins) and the [core plugins](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/src/common/core) (already included in BunkerWeb but they are plugins, technically speaking). The first step is to create a folder that will contain the plugin : @@ -507,7 +507,7 @@ end !!! tip "More examples" - If you want to see the full list of available functions, you can have a look at the files present in the [lua directory](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/src/bw/lua/bunkerweb) of the repository. + If you want to see the full list of available functions, you can have a look at the files present in the [lua directory](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/src/bw/lua/bunkerweb) of the repository. ### Jobs diff --git a/docs/quickstart-guide.md b/docs/quickstart-guide.md index 262a4a23a..4daf13da5 100644 --- a/docs/quickstart-guide.md +++ b/docs/quickstart-guide.md @@ -4,7 +4,7 @@ We assume that you're already familiar with the [core concepts](concepts.md) and you have followed the [integrations instructions](integrations.md) for your environment. !!! tip "Going further" - To demonstrate the use of BunkerWeb, we will deploy a dummy "Hello World" web application as an example. See the [examples folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/examples) of the repository to get real-world examples. + To demonstrate the use of BunkerWeb, we will deploy a dummy "Hello World" web application as an example. See the [examples folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/examples) of the repository to get real-world examples. ## Protect HTTP applications @@ -35,7 +35,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -52,7 +52,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -385,7 +385,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -405,7 +405,7 @@ You will find more settings about reverse proxy in the [settings section](settin - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -820,7 +820,7 @@ REAL_IP_HEADER=X-Forwarded-For ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ... environment: - USE_REAL_IP=yes @@ -835,7 +835,7 @@ REAL_IP_HEADER=X-Forwarded-For ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ... environment: - USE_REAL_IP=yes @@ -850,7 +850,7 @@ REAL_IP_HEADER=X-Forwarded-For ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ... environment: - USE_REAL_IP=yes @@ -970,7 +970,7 @@ REAL_IP_HEADER=proxy_protocol ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ... environment: - USE_REAL_IP=yes @@ -986,7 +986,7 @@ REAL_IP_HEADER=proxy_protocol ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ... environment: - USE_REAL_IP=yes @@ -1002,7 +1002,7 @@ REAL_IP_HEADER=proxy_protocol ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ... environment: - USE_REAL_IP=yes @@ -1148,7 +1148,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 # Keep it if you want to use Let's Encrypt automation - 10000:10000 # app1 @@ -1170,7 +1170,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -1218,7 +1218,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 # Keep it if you want to use Let's Encrypt automation - 10000:10000 # app1 @@ -1276,7 +1276,7 @@ For complete list of settings regarding `stream` mode, please refer to the [sett services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: # Keep it if you want to use Let's Encrypt automation - published: 80 @@ -1462,7 +1462,7 @@ Some integrations offer a more convenient way of applying configurations such as ```yaml ... mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 environment: - | CUSTOM_CONF_SERVER_HTTP_hello-world= @@ -1505,7 +1505,7 @@ Some integrations offer a more convenient way of applying configurations such as ```yaml mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 volumes: - ./bw-data:/data ... @@ -1574,7 +1574,7 @@ Some integrations offer a more convenient way of applying configurations such as ```yaml myautoconf: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 volumes: - ./bw-data:/data ... @@ -1807,7 +1807,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma - bw-services bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 volumes: - ./www:/var/www/html ports: @@ -1830,7 +1830,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -1907,7 +1907,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 volumes: - ./www:/var/www/html labels: @@ -1921,7 +1921,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -2064,7 +2064,7 @@ BunkerWeb supports PHP using external or remote [PHP-FPM](https://www.php.net/ma services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 volumes: - /shared/www:/var/www/html ... @@ -2343,7 +2343,7 @@ By default, BunkerWeb will only listen on IPv4 adresses and won't use IPv6 for n services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 environment: - USE_IPv6=yes @@ -2388,7 +2388,7 @@ By default, BunkerWeb will only listen on IPv4 adresses and won't use IPv6 for n services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 environment: - USE_IPv6=yes diff --git a/docs/security-tuning.md b/docs/security-tuning.md index 33cde0c0d..ad3c14d31 100644 --- a/docs/security-tuning.md +++ b/docs/security-tuning.md @@ -476,7 +476,7 @@ You can quickly protect sensitive resources like the admin area for example, by ### Auth request -You can deploy complex authentication (e.g. SSO), by using the auth request settings (see [here](https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/) for more information on the feature). Please note that you will find [Authelia](https://www.authelia.com/) and [Authentik](https://goauthentik.io/) examples in the [repository](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/examples). +You can deploy complex authentication (e.g. SSO), by using the auth request settings (see [here](https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/) for more information on the feature). Please note that you will find [Authelia](https://www.authelia.com/) and [Authentik](https://goauthentik.io/) examples in the [repository](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/examples). **Auth request settings are related to reverse proxy rules.** diff --git a/docs/web-ui.md b/docs/web-ui.md index e0679eacb..886ad11ec 100644 --- a/docs/web-ui.md +++ b/docs/web-ui.md @@ -61,7 +61,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) of the repository. Here is the docker-compose boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -70,7 +70,7 @@ Because the web UI is a web application, the recommended installation procedure services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -95,7 +95,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -116,7 +116,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 depends_on: - bw-docker environment: @@ -183,7 +183,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the docker-compose files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) of the repository. Here is the docker-compose boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -192,7 +192,7 @@ Because the web UI is a web application, the recommended installation procedure services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -209,7 +209,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -222,7 +222,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -256,7 +256,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 networks: bw-docker: bw-universe: @@ -320,7 +320,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the stack files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the stack files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) of the repository. Here is the stack boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -329,7 +329,7 @@ Because the web UI is a web application, the recommended installation procedure services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -359,7 +359,7 @@ Because the web UI is a web application, the recommended installation procedure - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -386,7 +386,7 @@ Because the web UI is a web application, the recommended installation procedure - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -413,7 +413,7 @@ Because the web UI is a web application, the recommended installation procedure - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 environment: - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database - DOCKER_HOST=tcp://bw-docker:2375 @@ -469,7 +469,7 @@ Because the web UI is a web application, the recommended installation procedure !!! info "Database backend" - If you want another Database backend than MariaDB please refer to the yaml files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0-beta/misc/integrations) of the repository. + If you want another Database backend than MariaDB please refer to the yaml files in the [misc/integrations folder](https://github.com/bunkerity/bunkerweb/tree/v1.5.0/misc/integrations) of the repository. Here is the yaml boilerplate that you can use (don't forget to edit the `changeme` data) : @@ -524,7 +524,7 @@ Because the web UI is a web application, the recommended installation procedure containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -594,7 +594,7 @@ Because the web UI is a web application, the recommended installation procedure serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -621,7 +621,7 @@ Because the web UI is a web application, the recommended installation procedure serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -705,7 +705,7 @@ Because the web UI is a web application, the recommended installation procedure spec: containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 imagePullPolicy: Always env: - name: ADMIN_USERNAME @@ -833,6 +833,7 @@ Because the web UI is a web application, the recommended installation procedure Here is the `/etc/bunkerweb/variables.env` boilerplate you can use : ```conf + API_LISTEN_IP=127.0.0.1 HTTP_PORT=80 HTTPS_PORT=443 DNS_RESOLVERS=8.8.8.8 8.8.4.4 diff --git a/examples/authelia/docker-compose.yml b/examples/authelia/docker-compose.yml index e00d52cb3..3f2afe2b1 100644 --- a/examples/authelia/docker-compose.yml +++ b/examples/authelia/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -44,7 +44,7 @@ services: - app2.example.com_REVERSE_PROXY_HEADERS=Remote-User $$user;Remote-Groups $$groups;Remote-Name $$name;Remote-Email $$email bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/authelia/swarm.yml b/examples/authelia/swarm.yml index 335c2a257..703d62340 100644 --- a/examples/authelia/swarm.yml +++ b/examples/authelia/swarm.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: # APPLICATIONS diff --git a/examples/authentik/docker-compose.yml b/examples/authentik/docker-compose.yml index 81918a92a..5efadbaaa 100644 --- a/examples/authentik/docker-compose.yml +++ b/examples/authentik/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.4" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -53,7 +53,7 @@ services: - app2.example.com_REVERSE_PROXY_HEADERS=X-authentik-username $$authentik_username;X-authentik-groups $$authentik_groups;X-authentik-email $$authentik_email;X-authentik-name $$authentik_name;X-authentik-uid $$authentik_uid bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/behind-reverse-proxy/docker-compose.yml b/examples/behind-reverse-proxy/docker-compose.yml index 71bd362d3..0c0cbb64a 100644 --- a/examples/behind-reverse-proxy/docker-compose.yml +++ b/examples/behind-reverse-proxy/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 environment: - SERVER_NAME=www.example.com # replace with your domains - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 @@ -24,7 +24,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/bigbluebutton/docker-compose.yml b/examples/bigbluebutton/docker-compose.yml index 791dcae22..615389ce2 100644 --- a/examples/bigbluebutton/docker-compose.yml +++ b/examples/bigbluebutton/docker-compose.yml @@ -27,7 +27,7 @@ services: ... mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -50,7 +50,7 @@ services: bw-universe: bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-cloudflare/docker-compose.yml b/examples/certbot-dns-cloudflare/docker-compose.yml index 147d3ea3a..eb2e03eee 100644 --- a/examples/certbot-dns-cloudflare/docker-compose.yml +++ b/examples/certbot-dns-cloudflare/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-digitalocean/docker-compose.yml b/examples/certbot-dns-digitalocean/docker-compose.yml index 155497478..d0f363e74 100644 --- a/examples/certbot-dns-digitalocean/docker-compose.yml +++ b/examples/certbot-dns-digitalocean/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-google/docker-compose.yml b/examples/certbot-dns-google/docker-compose.yml index 3d0313a5a..56bdff380 100644 --- a/examples/certbot-dns-google/docker-compose.yml +++ b/examples/certbot-dns-google/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-ovh/docker-compose.yml b/examples/certbot-dns-ovh/docker-compose.yml index 2a6f12159..e6fbe6885 100644 --- a/examples/certbot-dns-ovh/docker-compose.yml +++ b/examples/certbot-dns-ovh/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/certbot-dns-route53/docker-compose.yml b/examples/certbot-dns-route53/docker-compose.yml index 0e36592bc..7c1f901ea 100644 --- a/examples/certbot-dns-route53/docker-compose.yml +++ b/examples/certbot-dns-route53/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -33,7 +33,7 @@ services: - bw-services bbw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/community/brawdunoir-homelab/docker/authelia/.env b/examples/community/brawdunoir-homelab/docker/authelia/.env deleted file mode 100644 index ac4ed1932..000000000 --- a/examples/community/brawdunoir-homelab/docker/authelia/.env +++ /dev/null @@ -1,4 +0,0 @@ -PUID=1000 -PGID=1000 -UMASK=002 -TZ=Europe/Paris diff --git a/examples/community/brawdunoir-homelab/docker/authelia/config/configuration.yml b/examples/community/brawdunoir-homelab/docker/authelia/config/configuration.yml deleted file mode 100644 index c2106875c..000000000 --- a/examples/community/brawdunoir-homelab/docker/authelia/config/configuration.yml +++ /dev/null @@ -1,161 +0,0 @@ -# yamllint disable rule:comments-indentation ---- -theme: auto - -jwt_secret: changeme - -default_redirection_url: https://example.com - -## -## Server Configuration -## -server: - host: 0.0.0.0 - port: 9091 - -## -## Log Configuration -## -log: - ## Level of verbosity for logs: info, debug, trace. - level: debug - -## -## TOTP Configuration -## -## Parameters used for TOTP generation. -totp: - disable: false - issuer: authelia.com - algorithm: sha1 - digits: 6 - period: 30 - skew: 1 - secret_size: 32 - -## -## WebAuthn Configuration -## -## Parameters used for WebAuthn. -webauthn: - disable: false - timeout: 60s - display_name: Authelia - attestation_conveyance_preference: indirect - user_verification: preferred - -## -## NTP Configuration -## -## This is used to validate the servers time is accurate enough to validate TOTP. -ntp: - address: "time.cloudflare.com:123" - version: 4 - max_desync: 3s - disable_startup_check: false - disable_failure: false - -## -## Authentication Backend Provider Configuration -## -## Used for verifying user passwords and retrieve information such as email address and groups users belong to. -## -## The available providers are: `file`, `ldap`. You must use only one of these providers. -authentication_backend: - ## Password Reset Options. - password_reset: - disable: true - refresh_interval: disable - - file: - path: /config/users_database.yml - -## -## Password Policy Configuration. -## -password_policy: - standard: - enabled: false - min_length: 12 - max_length: 0 - require_uppercase: true - require_lowercase: true - require_number: true - require_special: true - zxcvbn: - enabled: true - min_score: 3 - -## -## Access Control Configuration -## -## Access control is a list of rules defining the authorizations applied for one resource to users or group of users. -access_control: - default_policy: deny - networks: - - name: internal - networks: - - 10.20.30.0/24 - - 192.168.1.0/24 - rules: - - domain: "example.com" - networks: - - internal - policy: bypass - - domain: "*.example.com" - networks: - - internal - policy: bypass - - domain: "radarr.example.com" - subject: "group:admins" - policy: one_factor - - domain: "sonarr.example.com" - subject: "group:admins" - policy: one_factor - - domain: "prowlarr.example.com" - subject: "group:admins" - policy: one_factor - - domain: "transmission.example.com" - subject: "group:admins" - policy: one_factor - - domain: "example.com" - policy: one_factor - -## -## Session Provider Configuration -## -## The session cookies identify the user once logged in. -## The available providers are: `memory`, `redis`. Memory is the provider unless redis is defined. -session: - name: authelia_session - domain: example.com - same_site: lax - secret: insecure_session_secret - expiration: 1h - inactivity: 1h - remember_me_duration: 1M - -## -## Regulation Configuration -## -## This mechanism prevents attackers from brute forcing the first factor. It bans the user if too many attempts are made -## in a short period of time. -regulation: - max_retries: 5 - find_time: 2m - ban_time: 1d - -storage: - encryption_key: 8EUfpC7aWuxoJVmmHsAonoAQt38Hxq3H3rYWjNMUdSpMVz6Y6jGzFCrtrFHqBYnUHZN4JF - local: - path: /config/db.sqlite3 - -## -## Notification Provider -## -## Notifications are sent to users when they require a password reset, a Webauthn registration or a TOTP registration. -## The available providers are: filesystem, smtp. You must use only one of these providers. -notifier: - disable_startup_check: true - filesystem: - filename: /config/notification.txt diff --git a/examples/community/brawdunoir-homelab/docker/authelia/config/notification.txt b/examples/community/brawdunoir-homelab/docker/authelia/config/notification.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/examples/community/brawdunoir-homelab/docker/authelia/config/users_database.yml b/examples/community/brawdunoir-homelab/docker/authelia/config/users_database.yml deleted file mode 100644 index 39848c0c2..000000000 --- a/examples/community/brawdunoir-homelab/docker/authelia/config/users_database.yml +++ /dev/null @@ -1,8 +0,0 @@ -users: - John: - displayname: "John Doe" - # password is "whynot123" - password: "$argon2id$v=19$m=65536,t=3,p=4$ZjVaWjlOQ2tZOCttdTArZQ$3fpj/Mc1XQgX17NuDcS0BKVXXVfMEIZ7knf2yT+L77M" - email: john.doe@example.com - groups: - - admins diff --git a/examples/community/brawdunoir-homelab/docker/authelia/docker-compose.yaml b/examples/community/brawdunoir-homelab/docker/authelia/docker-compose.yaml deleted file mode 100644 index 44186d081..000000000 --- a/examples/community/brawdunoir-homelab/docker/authelia/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3.5" - -services: - authelia: - image: authelia/authelia - container_name: authelia - restart: unless-stopped - healthcheck: - disable: true - environment: - - PUID=${PUID} - - PGID=${PGID} - - UMASK=${UMASK} - - TZ=${TZ} - networks: - bw-services: - aliases: - - authelia - volumes: - - ./config:/config - labels: - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.SERVER_NAME=auth.example.com" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://authelia:9091" - - "bunkerweb.REVERSE_PROXY_INTERCEPT_ERRORS=no" - -networks: - bw-services: - name: bw-services diff --git a/examples/community/brawdunoir-homelab/docker/bw/bw-data/modsec-crs/nextcloud.conf b/examples/community/brawdunoir-homelab/docker/bw/bw-data/modsec-crs/nextcloud.conf deleted file mode 100644 index e69a38d42..000000000 --- a/examples/community/brawdunoir-homelab/docker/bw/bw-data/modsec-crs/nextcloud.conf +++ /dev/null @@ -1,16 +0,0 @@ -SecAction \ - "id:900130,\ - phase:1,\ - nolog,\ - pass,\ - t:none,\ - setvar:tx.crs_exclusions_nextcloud=1" - -# WebDAV -SecAction \ - "id:900200,\ - phase:1,\ - nolog,\ - pass,\ - t:none,\ - setvar:'tx.allowed_methods=GET POST HEAD COPY DELETE LOCK MKCOL MOVE PROPFIND PROPPATCH PUT UNLOCK OPTIONS'" diff --git a/examples/community/brawdunoir-homelab/docker/bw/bw-data/modsec/nextcloud.conf b/examples/community/brawdunoir-homelab/docker/bw/bw-data/modsec/nextcloud.conf deleted file mode 100644 index 0f57eb894..000000000 --- a/examples/community/brawdunoir-homelab/docker/bw/bw-data/modsec/nextcloud.conf +++ /dev/null @@ -1 +0,0 @@ -SecRule REQUEST_FILENAME "@rx ^/remote.php/dav/files/" "id:2000,ctl:ruleRemoveByTag=attack-protocol,ctl:ruleRemoveByTag=attack-generic,nolog" \ No newline at end of file diff --git a/examples/community/brawdunoir-homelab/docker/bw/docker-compose.yaml b/examples/community/brawdunoir-homelab/docker/bw/docker-compose.yaml deleted file mode 100644 index 424db5bc1..000000000 --- a/examples/community/brawdunoir-homelab/docker/bw/docker-compose.yaml +++ /dev/null @@ -1,79 +0,0 @@ -version: "3.5" - -services: - mybunker: - image: bunkerity/bunkerweb:1.5.0 - container_name: mybunker - restart: always - ports: - - 80:8080 - - 443:8443 - environment: - - MULTISITE=yes - - AUTOCONF_MODE=yes - - REDIRECT_HTTP_TO_HTTPS=yes - - DISABLE_DEFAULT_SERVER=yes - - USE_CLIENT_CACHE=yes - - AUTO_LETS_ENCRYPT=yes - - SERVER_NAME= - - USE_GZIP=yes - - SERVE_FILES=no - - BAD_BEHAVIOR_STATUS_CODES=400 401 403 405 444 - - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 - labels: - - "bunkerweb.INSTANCE" - networks: - - bw-universe - - bw-services - - bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0 - depends_on: - - mybunker - environment: - - AUTOCONF_MODE=yes - - DOCKER_HOST=tcp://docker-proxy:2375 - volumes: - - ./bw-data:/data - networks: - - bw-universe - - net-docker - - myautoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0 - container_name: myautoconf - restart: always - # ⚠️ read this if you use local folders for volumes ⚠️ - # bunkerweb runs as an unprivileged user with UID/GID 101 - # don't forget to edit the permissions of the files and folders accordingly - # example if you need to create a directory : mkdir folder && chown root:101 folder && chmod 770 folder - # another example for existing folder : chown -R root:101 folder && chmod -R 770 folder - # you can also run ./setup.sh as root to do this for you - # more info at https://docs.bunkerweb.io - volumes: - - ./bw-data:/data - - /var/run/docker.sock:/var/run/docker.sock:ro - networks: - - bw-universe - - docker-proxy: - image: tecnativa/docker-socket-proxy:0.1 - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - environment: - - CONTAINERS=1 - networks: - - net-docker - -volumes: - bw-data: - -networks: - bw-universe: - ipam: - driver: default - config: - - subnet: 10.20.30.0/24 - bw-services: - name: bw-services - net-docker: diff --git a/examples/community/brawdunoir-homelab/docker/bw/setup.sh b/examples/community/brawdunoir-homelab/docker/bw/setup.sh deleted file mode 100755 index 556099fb8..000000000 --- a/examples/community/brawdunoir-homelab/docker/bw/setup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -if [ $(id -u) -ne 0 ] ; then - echo "❌ Run me as root" - exit 1 -fi - -chown -R root:101 bw-data -chmod -R 770 bw-data \ No newline at end of file diff --git a/examples/community/brawdunoir-homelab/docker/heimdall/.env b/examples/community/brawdunoir-homelab/docker/heimdall/.env deleted file mode 100644 index 8228a1e2e..000000000 --- a/examples/community/brawdunoir-homelab/docker/heimdall/.env +++ /dev/null @@ -1,3 +0,0 @@ -PUID=1000 -PGID=1000 -TZ=Europe/Paris diff --git a/examples/community/brawdunoir-homelab/docker/heimdall/docker-compose.yaml b/examples/community/brawdunoir-homelab/docker/heimdall/docker-compose.yaml deleted file mode 100644 index 5dee21f2f..000000000 --- a/examples/community/brawdunoir-homelab/docker/heimdall/docker-compose.yaml +++ /dev/null @@ -1,37 +0,0 @@ -version: "3.5" - -services: - heimdall: - image: lscr.io/linuxserver/heimdall:latest - container_name: heimdall - restart: unless-stopped - networks: - bw-services: - aliases: - - heimdall - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - volumes: - - ./config:/config - security_opt: - - no-new-privileges:true - labels: - - "bunkerweb.SERVER_NAME=example.com" - - "bunkerweb.ALLOWED_METHODS=GET|POST|HEAD|DELETE|PUT" - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://heimdall" - - "bunkerweb.LIMIT_REQ_RATE=10r/s" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST=/authelia" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SIGNIN_URL=https://auth.example.com/?rd=$$scheme%3A%2F%2F$$host$$request_uri" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SET=$$user $$upstream_http_remote_user;$$groups $$upstream_http_remote_groups;$$name $$upstream_http_remote_name;$$email $$upstream_http_remote_email" - - "bunkerweb.REVERSE_PROXY_HEADERS=Remote-User $$user;Remote-Groups $$groups;Remote-Name $$name;Remote-Email $$email" - - "bunkerweb.REVERSE_PROXY_URL_999=/authelia" - - "bunkerweb.REVERSE_PROXY_HOST_999=http://authelia:9091/api/verify" - - 'bunkerweb.REVERSE_PROXY_HEADERS_999=X-Original-URL $$scheme://$$http_host$$request_uri;Content-Length ""' - -networks: - bw-services: - name: bw-services diff --git a/examples/community/brawdunoir-homelab/docker/mediacenter/jellyfin/.env b/examples/community/brawdunoir-homelab/docker/mediacenter/jellyfin/.env deleted file mode 100644 index ac4ed1932..000000000 --- a/examples/community/brawdunoir-homelab/docker/mediacenter/jellyfin/.env +++ /dev/null @@ -1,4 +0,0 @@ -PUID=1000 -PGID=1000 -UMASK=002 -TZ=Europe/Paris diff --git a/examples/community/brawdunoir-homelab/docker/mediacenter/jellyfin/docker-compose.yaml b/examples/community/brawdunoir-homelab/docker/mediacenter/jellyfin/docker-compose.yaml deleted file mode 100644 index 9b65c5849..000000000 --- a/examples/community/brawdunoir-homelab/docker/mediacenter/jellyfin/docker-compose.yaml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3.5" - -services: - jellyfin: - container_name: jellyfin - image: cr.hotio.dev/hotio/jellyfin - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - UMASK=${UMASK} - restart: unless-stopped - networks: - bw-services: - aliases: - - jellyfin - security_opt: - - no-new-privileges:true - volumes: - - path/to/config:/config - - path/to/data:/media # should be the same as radarr/sonarr - labels: - - "bunkerweb.SERVER_NAME=jellyfin.example.com" - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://jellyfin:8096" - -networks: - bw-services: - name: bw-services diff --git a/examples/community/brawdunoir-homelab/docker/mediacenter/library/.env b/examples/community/brawdunoir-homelab/docker/mediacenter/library/.env deleted file mode 100644 index ac4ed1932..000000000 --- a/examples/community/brawdunoir-homelab/docker/mediacenter/library/.env +++ /dev/null @@ -1,4 +0,0 @@ -PUID=1000 -PGID=1000 -UMASK=002 -TZ=Europe/Paris diff --git a/examples/community/brawdunoir-homelab/docker/mediacenter/library/docker-compose.yaml b/examples/community/brawdunoir-homelab/docker/mediacenter/library/docker-compose.yaml deleted file mode 100644 index f75da5de3..000000000 --- a/examples/community/brawdunoir-homelab/docker/mediacenter/library/docker-compose.yaml +++ /dev/null @@ -1,154 +0,0 @@ -version: "3.5" - -services: - radarr: - image: linuxserver/radarr - container_name: radarr - restart: unless-stopped - environment: - - PUID=${PUID} - - PGID=${PGID} - - UMASK=${UMASK} - - TZ=${TZ} - networks: - bw-services: - aliases: - - radarr - security_opt: - - no-new-privileges:true - volumes: - - path/to/config:/config - - path/to/data:/data # should be same as transmission - labels: - - "bunkerweb.SERVER_NAME=radarr.example.com" - - "bunkerweb.ALLOWED_METHODS=GET|POST|HEAD|DELETE|PUT" - - "bunkerweb.REVERSE_PROXY_WS=yes" - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://radarr:7878" - - "bunkerweb.LIMIT_REQ_URL_1=^/api" - - "bunkerweb.LIMIT_REQ_RATE_1=10r/s" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST=/authelia" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SIGNIN_URL=https://auth.example.com/?rd=$$scheme%3A%2F%2F$$host$$request_uri" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SET=$$user $$upstream_http_remote_user;$$groups $$upstream_http_remote_groups;$$name $$upstream_http_remote_name;$$email $$upstream_http_remote_email" - - "bunkerweb.REVERSE_PROXY_HEADERS=Remote-User $$user;Remote-Groups $$groups;Remote-Name $$name;Remote-Email $$email" - - "bunkerweb.REVERSE_PROXY_URL_999=/authelia" - - "bunkerweb.REVERSE_PROXY_HOST_999=http://authelia:9091/api/verify" - - 'bunkerweb.REVERSE_PROXY_HEADERS_999=X-Original-URL $$scheme://$$http_host$$request_uri;Content-Length ""' - - sonarr: - image: linuxserver/sonarr - container_name: sonarr - restart: unless-stopped - environment: - - PUID=${PUID} - - PGID=${PGID} - - UMASK=${UMASK} - - TZ=${TZ} - networks: - bw-services: - aliases: - - sonarr - security_opt: - - no-new-privileges:true - volumes: - - path/to/config:/config - - path/to/data:/data # should be same as transmission - labels: - - "bunkerweb.SERVER_NAME=sonarr.example.com" - - "bunkerweb.ALLOWED_METHODS=GET|POST|HEAD|DELETE|PUT" - - "bunkerweb.REVERSE_PROXY_WS=yes" - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://sonarr:8989" - - "bunkerweb.LIMIT_REQ_URL_1=^/api" - - "bunkerweb.LIMIT_REQ_RATE_1=10r/s" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST=/authelia" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SIGNIN_URL=https://auth.example.com/?rd=$$scheme%3A%2F%2F$$host$$request_uri" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SET=$$user $$upstream_http_remote_user;$$groups $$upstream_http_remote_groups;$$name $$upstream_http_remote_name;$$email $$upstream_http_remote_email" - - "bunkerweb.REVERSE_PROXY_HEADERS=Remote-User $$user;Remote-Groups $$groups;Remote-Name $$name;Remote-Email $$email" - - "bunkerweb.REVERSE_PROXY_URL_999=/authelia" - - "bunkerweb.REVERSE_PROXY_HOST_999=http://authelia:9091/api/verify" - - 'bunkerweb.REVERSE_PROXY_HEADERS_999=X-Original-URL $$scheme://$$http_host$$request_uri;Content-Length ""' - - prowlarr: - container_name: prowlarr - image: linuxserver/prowlarr:develop - restart: unless-stopped - environment: - - PUID=${PUID} - - PGID=${PGID} - - UMASK=${UMASK} - - TZ=${TZ} - volumes: - - path/to/config:/config - networks: - bw-services: - aliases: - - prowlarr - security_opt: - - no-new-privileges:true - labels: - - "bunkerweb.SERVER_NAME=prowlarr.example.com" - - "bunkerweb.ALLOWED_METHODS=GET|POST|HEAD|DELETE|PUT" - - "bunkerweb.REVERSE_PROXY_WS=yes" - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://prowlarr:9696" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST=/authelia" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SIGNIN_URL=https://auth.example.com/?rd=$$scheme%3A%2F%2F$$host$$request_uri" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SET=$$user $$upstream_http_remote_user;$$groups $$upstream_http_remote_groups;$$name $$upstream_http_remote_name;$$email $$upstream_http_remote_email" - - "bunkerweb.REVERSE_PROXY_HEADERS=Remote-User $$user;Remote-Groups $$groups;Remote-Name $$name;Remote-Email $$email" - - "bunkerweb.REVERSE_PROXY_URL_999=/authelia" - - "bunkerweb.REVERSE_PROXY_HOST_999=http://authelia:9091/api/verify" - - 'bunkerweb.REVERSE_PROXY_HEADERS_999=X-Original-URL $$scheme://$$http_host$$request_uri;Content-Length ""' - - flaresolverr: - container_name: flaresolverr - image: flaresolverr/flaresolverr - restart: unless-stopped - ports: - - 8191:8191 - environment: - - LOG_LEVEL=${LOG_LEVEL:-info} - - LOG_HTML=${LOG_HTML:-false} - - CAPTCHA_SOLVER=${CAPTCHA_SOLVER:-none} - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - transmission: - container_name: transmission - image: linuxserver/transmission - restart: unless-stopped - networks: - bw-services: - aliases: - - transmission - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - volumes: - - path/to/config:/config - - path/to/data/downloads:/data/downloads # path to /data should be same as other services - security_opt: - - no-new-privileges:true - labels: - - "bunkerweb.SERVER_NAME=transmission.example.com" - - "bunkerweb.ALLOWED_METHODS=GET|POST|HEAD|DELETE|PUT" - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://transmission:9091" - - "bunkerweb.LIMIT_REQ_RATE=10r/s" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST=/authelia" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SIGNIN_URL=https://auth.example.com/?rd=$$scheme%3A%2F%2F$$host$$request_uri" - - "bunkerweb.REVERSE_PROXY_AUTH_REQUEST_SET=$$user $$upstream_http_remote_user;$$groups $$upstream_http_remote_groups;$$name $$upstream_http_remote_name;$$email $$upstream_http_remote_email" - - "bunkerweb.REVERSE_PROXY_HEADERS=Remote-User $$user;Remote-Groups $$groups;Remote-Name $$name;Remote-Email $$email" - - "bunkerweb.REVERSE_PROXY_URL_999=/authelia" - - "bunkerweb.REVERSE_PROXY_HOST_999=http://authelia:9091/api/verify" - - 'bunkerweb.REVERSE_PROXY_HEADERS_999=X-Original-URL $$scheme://$$http_host$$request_uri;Content-Length ""' - -networks: - bw-services: - name: bw-services diff --git a/examples/community/brawdunoir-homelab/docker/nextcloud/.env b/examples/community/brawdunoir-homelab/docker/nextcloud/.env deleted file mode 100644 index 8228a1e2e..000000000 --- a/examples/community/brawdunoir-homelab/docker/nextcloud/.env +++ /dev/null @@ -1,3 +0,0 @@ -PUID=1000 -PGID=1000 -TZ=Europe/Paris diff --git a/examples/community/brawdunoir-homelab/docker/nextcloud/docker-compose.yaml b/examples/community/brawdunoir-homelab/docker/nextcloud/docker-compose.yaml deleted file mode 100644 index 1d5eb99cd..000000000 --- a/examples/community/brawdunoir-homelab/docker/nextcloud/docker-compose.yaml +++ /dev/null @@ -1,80 +0,0 @@ -version: "3.5" - -services: - nextcloud: - image: nextcloud:23-apache - container_name: nextcloud - restart: unless-stopped - volumes: - - path/to/app:/var/www/html - - path/to/data:/var/www/html/data - networks: - bw-services: - aliases: - - nextcloud - nextcloud: - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - MYSQL_HOST=mydb - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - MYSQL_PASSWORD=changeme # should be same as mariadb password - - REDIS_HOST=redis - - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.example.com - - TRUSTED_PROXIES=192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 - - APACHE_DISABLE_REWRITE_IP=1 - labels: - - "bunkerweb.SERVER_NAME=nextcloud.example.com" - - "bunkerweb.USE_REVERSE_PROXY=yes" - - "bunkerweb.REVERSE_PROXY_URL=/" - - "bunkerweb.REVERSE_PROXY_HOST=http://nextcloud" - - "bunkerweb.MAX_CLIENT_SIZE=10G" - - "bunkerweb.USE_CLIENT_CACHE=yes" - - "bunkerweb.SERVE_FILES=no" - - "bunkerweb.ALLOWED_METHODS=GET|POST|HEAD|COPY|DELETE|LOCK|MKCOL|MOVE|PROPFIND|PROPPATCH|PUT|UNLOCK|OPTIONS|SEARCH" - - "bunkerweb.X_FRAME_OPTIONS=SAMEORIGIN" - - "bunkerweb.USE_GZIP=yes" - - "bunkerweb.BAD_BEHAVIOR_STATUS_CODES=400 401 403 405 444" - - "bunkerweb.WHITELIST_USER_AGENT=WebDAV" - - "bunkerweb.LIMIT_REQ_URL_1=/apps" - - "bunkerweb.LIMIT_REQ_RATE_1=15r/s" - - "bunkerweb.LIMIT_REQ_URL_2=/apps/text/session/sync" - - "bunkerweb.LIMIT_REQ_RATE_2=8r/s" - - "bunkerweb.LIMIT_REQ_URL_3=/core/preview" - - "bunkerweb.LIMIT_REQ_RATE_3=50r/s" - - mydb: - image: mariadb:10.8 - container_name: mariadb - restart: unless-stopped - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW --innodb-file-per-table=1 --skip-innodb-read-only-compressed - networks: - nextcloud: - volumes: - - $HOMEDIR/nextcloud/db:/var/lib/mysql - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - - MYSQL_ROOT_PASSWORD=changeme - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - MYSQL_PASSWORD=changeme # should be same as nextcloud database password - - redis: - image: redis:7 - container_name: redis - restart: unless-stopped - environment: - - PUID=${PUID} - - PGID=${PGID} - - TZ=${TZ} - networks: - nextcloud: - -networks: - nextcloud: - bw-services: - name: bw-services diff --git a/examples/cors/docker-compose.yml b/examples/cors/docker-compose.yml index 26847d183..22cefbdd4 100644 --- a/examples/cors/docker-compose.yml +++ b/examples/cors/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -38,7 +38,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/docker-configs/docker-compose.yml b/examples/docker-configs/docker-compose.yml index 69cd0fc07..2ab2ad0ed 100644 --- a/examples/docker-configs/docker-compose.yml +++ b/examples/docker-configs/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -53,7 +53,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/drupal/docker-compose.yml b/examples/drupal/docker-compose.yml index a92b031ea..679291eab 100644 --- a/examples/drupal/docker-compose.yml +++ b/examples/drupal/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/drupal/swarm.yml b/examples/drupal/swarm.yml index 12159225d..7564239c6 100644 --- a/examples/drupal/swarm.yml +++ b/examples/drupal/swarm.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: mydrupal: diff --git a/examples/ghost/docker-compose.yml b/examples/ghost/docker-compose.yml index d09c6fc6c..29ab2378f 100644 --- a/examples/ghost/docker-compose.yml +++ b/examples/ghost/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -24,7 +24,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/ghost/swarm.yml b/examples/ghost/swarm.yml index 7df6bb4ec..30635f000 100644 --- a/examples/ghost/swarm.yml +++ b/examples/ghost/swarm.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: myghost: diff --git a/examples/gogs/docker-compose.yml b/examples/gogs/docker-compose.yml index a96e4f047..df6a0e57d 100644 --- a/examples/gogs/docker-compose.yml +++ b/examples/gogs/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/gogs/swarm.yml b/examples/gogs/swarm.yml index 3e296e542..f423a0f45 100644 --- a/examples/gogs/swarm.yml +++ b/examples/gogs/swarm.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: mygogs: diff --git a/examples/hardened/docker-compose.yml b/examples/hardened/docker-compose.yml index f0c773ef8..dac0b84c7 100644 --- a/examples/hardened/docker-compose.yml +++ b/examples/hardened/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 # dropping all capabilities cap_drop: - ALL @@ -38,7 +38,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/joomla/docker-compose.yml b/examples/joomla/docker-compose.yml index ee504ebd3..522b10294 100644 --- a/examples/joomla/docker-compose.yml +++ b/examples/joomla/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/joomla/swarm.yml b/examples/joomla/swarm.yml index c2025d9a9..782704316 100644 --- a/examples/joomla/swarm.yml +++ b/examples/joomla/swarm.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: myjoomla: diff --git a/examples/load-balancer/docker-compose.yml b/examples/load-balancer/docker-compose.yml index 1de8dcb4a..4f91602aa 100644 --- a/examples/load-balancer/docker-compose.yml +++ b/examples/load-balancer/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -31,7 +31,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/magento/docker-compose.yml b/examples/magento/docker-compose.yml index b53682c42..d96f70775 100644 --- a/examples/magento/docker-compose.yml +++ b/examples/magento/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -29,7 +29,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/mattermost/docker-compose.yml b/examples/mattermost/docker-compose.yml index 92696d1dc..d32b439cf 100644 --- a/examples/mattermost/docker-compose.yml +++ b/examples/mattermost/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -44,7 +44,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/mongo-express/docker-compose.yml b/examples/mongo-express/docker-compose.yml index 1c7e020aa..35ee63dfc 100644 --- a/examples/mongo-express/docker-compose.yml +++ b/examples/mongo-express/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/moodle/docker-compose.yml b/examples/moodle/docker-compose.yml index 945e21bed..e55004575 100644 --- a/examples/moodle/docker-compose.yml +++ b/examples/moodle/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -25,7 +25,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/nextcloud/docker-compose.yml b/examples/nextcloud/docker-compose.yml index 129bdf89c..781c3806a 100644 --- a/examples/nextcloud/docker-compose.yml +++ b/examples/nextcloud/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -54,7 +54,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/passbolt/docker-compose.yml b/examples/passbolt/docker-compose.yml index 60d74129e..9854e02ba 100644 --- a/examples/passbolt/docker-compose.yml +++ b/examples/passbolt/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -26,7 +26,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/php-cookie-flags/docker-compose.yml b/examples/php-cookie-flags/docker-compose.yml index abdb662fe..b5227e22a 100644 --- a/examples/php-cookie-flags/docker-compose.yml +++ b/examples/php-cookie-flags/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -31,7 +31,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/php-multisite/docker-compose.yml b/examples/php-multisite/docker-compose.yml index 993a914a4..b41f75939 100644 --- a/examples/php-multisite/docker-compose.yml +++ b/examples/php-multisite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -34,7 +34,7 @@ services: - net-app2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/php-singlesite/docker-compose.yml b/examples/php-singlesite/docker-compose.yml index bce57ea97..89ebaf9b2 100644 --- a/examples/php-singlesite/docker-compose.yml +++ b/examples/php-singlesite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -30,7 +30,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/prestashop/docker-compose.yml b/examples/prestashop/docker-compose.yml index eee02b6c8..4aa1b446d 100644 --- a/examples/prestashop/docker-compose.yml +++ b/examples/prestashop/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/proxy-protocol/docker-compose.yml b/examples/proxy-protocol/docker-compose.yml index 3235bfe22..2d5cafdd2 100644 --- a/examples/proxy-protocol/docker-compose.yml +++ b/examples/proxy-protocol/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 environment: - SERVER_NAME=www.example.com # replace with your domains - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/radarr/docker-compose.yml b/examples/radarr/docker-compose.yml index 1dc633c1b..1eed50fc7 100644 --- a/examples/radarr/docker-compose.yml +++ b/examples/radarr/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -34,7 +34,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/radarr/swarm.yml b/examples/radarr/swarm.yml index 57b53281f..3471d02cd 100644 --- a/examples/radarr/swarm.yml +++ b/examples/radarr/swarm.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: radarr: diff --git a/examples/redmine/docker-compose.yml b/examples/redmine/docker-compose.yml index 8566d7d4d..f83d2992b 100644 --- a/examples/redmine/docker-compose.yml +++ b/examples/redmine/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -24,7 +24,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/reverse-proxy-multisite/docker-compose.yml b/examples/reverse-proxy-multisite/docker-compose.yml index 630de9f81..b72cf5de9 100644 --- a/examples/reverse-proxy-multisite/docker-compose.yml +++ b/examples/reverse-proxy-multisite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/reverse-proxy-singlesite/docker-compose.yml b/examples/reverse-proxy-singlesite/docker-compose.yml index ff462867a..6ea2cf0fc 100644 --- a/examples/reverse-proxy-singlesite/docker-compose.yml +++ b/examples/reverse-proxy-singlesite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -32,7 +32,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/reverse-proxy-websocket/docker-compose.yml b/examples/reverse-proxy-websocket/docker-compose.yml index d0bbaf9ed..c364680c5 100644 --- a/examples/reverse-proxy-websocket/docker-compose.yml +++ b/examples/reverse-proxy-websocket/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -25,7 +25,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/stream-multisite/docker-compose.yml b/examples/stream-multisite/docker-compose.yml index aad419d93..b32deab56 100644 --- a/examples/stream-multisite/docker-compose.yml +++ b/examples/stream-multisite/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 # required to resolve let's encrypt challenges - 10000:10000 # app1 without SSL/TLS @@ -33,7 +33,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/syslog/docker-compose.yml b/examples/syslog/docker-compose.yml index a58c91822..b3c3bd21f 100644 --- a/examples/syslog/docker-compose.yml +++ b/examples/syslog/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 logging: driver: syslog options: @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 logging: driver: syslog options: diff --git a/examples/tomcat/docker-compose.yml b/examples/tomcat/docker-compose.yml index 6ce18b33e..3939bf8a1 100644 --- a/examples/tomcat/docker-compose.yml +++ b/examples/tomcat/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -23,7 +23,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/tomcat/swarm.yml b/examples/tomcat/swarm.yml index b80f02253..583f09328 100644 --- a/examples/tomcat/swarm.yml +++ b/examples/tomcat/swarm.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "3" services: mytomcat: diff --git a/examples/tor-hidden-service/docker-compose.yml b/examples/tor-hidden-service/docker-compose.yml index 47835c5c2..3baebee71 100644 --- a/examples/tor-hidden-service/docker-compose.yml +++ b/examples/tor-hidden-service/docker-compose.yml @@ -12,7 +12,7 @@ services: - bw-universe mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 environment: - API_WHITELIST_IP=127.0.0.0/8 10.20.30.0/24 # disable common security measures based on IP @@ -34,7 +34,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/examples/web-ui/docker-compose.yml b/examples/web-ui/docker-compose.yml index bfe0abdc6..d28cbe1d6 100644 --- a/examples/web-ui/docker-compose.yml +++ b/examples/web-ui/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: @@ -40,7 +40,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 depends_on: - bw-docker-proxy environment: diff --git a/examples/wordpress/docker-compose.yml b/examples/wordpress/docker-compose.yml index 2f5ffa520..7123b8d22 100644 --- a/examples/wordpress/docker-compose.yml +++ b/examples/wordpress/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: mybunker: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -25,7 +25,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - mybunker environment: diff --git a/misc/integrations/autoconf.mariadb.ui.yml b/misc/integrations/autoconf.mariadb.ui.yml index 47a5d249f..2da422312 100644 --- a/misc/integrations/autoconf.mariadb.ui.yml +++ b/misc/integrations/autoconf.mariadb.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -66,7 +66,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.mariadb.yml b/misc/integrations/autoconf.mariadb.yml index da03e7875..c85e08fda 100644 --- a/misc/integrations/autoconf.mariadb.yml +++ b/misc/integrations/autoconf.mariadb.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/autoconf.mysql.ui.yml b/misc/integrations/autoconf.mysql.ui.yml index 55a58db67..dac0e0e5c 100644 --- a/misc/integrations/autoconf.mysql.ui.yml +++ b/misc/integrations/autoconf.mysql.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -66,7 +66,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.mysql.yml b/misc/integrations/autoconf.mysql.yml index 010a28281..3e66f69e3 100644 --- a/misc/integrations/autoconf.mysql.yml +++ b/misc/integrations/autoconf.mysql.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/autoconf.postgres.ui.yml b/misc/integrations/autoconf.postgres.ui.yml index 166bd4f12..9dbb960eb 100644 --- a/misc/integrations/autoconf.postgres.ui.yml +++ b/misc/integrations/autoconf.postgres.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -65,7 +65,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.postgres.yml b/misc/integrations/autoconf.postgres.yml index cf5933599..6924217b4 100644 --- a/misc/integrations/autoconf.postgres.yml +++ b/misc/integrations/autoconf.postgres.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -19,7 +19,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/autoconf.ui.yml b/misc/integrations/autoconf.ui.yml index f72cc2836..478debadc 100644 --- a/misc/integrations/autoconf.ui.yml +++ b/misc/integrations/autoconf.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -18,7 +18,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -55,7 +55,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 networks: bw-docker: bw-universe: diff --git a/misc/integrations/autoconf.yml b/misc/integrations/autoconf.yml index 29da75170..46cd8ac75 100644 --- a/misc/integrations/autoconf.yml +++ b/misc/integrations/autoconf.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -18,7 +18,7 @@ services: - bw-services bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 depends_on: - bunkerweb - bw-docker @@ -32,7 +32,7 @@ services: - bw-docker bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.mariadb.ui.yml b/misc/integrations/docker.mariadb.ui.yml index eb1b45b37..1dd4669f5 100644 --- a/misc/integrations/docker.mariadb.ui.yml +++ b/misc/integrations/docker.mariadb.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -48,7 +48,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 depends_on: - bw-docker environment: diff --git a/misc/integrations/docker.mariadb.yml b/misc/integrations/docker.mariadb.yml index aba08aac3..f7a5a2a64 100644 --- a/misc/integrations/docker.mariadb.yml +++ b/misc/integrations/docker.mariadb.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -17,7 +17,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.mysql.ui.yml b/misc/integrations/docker.mysql.ui.yml index c790b733e..ffd2039db 100644 --- a/misc/integrations/docker.mysql.ui.yml +++ b/misc/integrations/docker.mysql.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -27,7 +27,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -48,7 +48,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 depends_on: - bw-docker environment: diff --git a/misc/integrations/docker.mysql.yml b/misc/integrations/docker.mysql.yml index 51ccf2bd6..83e882c4b 100644 --- a/misc/integrations/docker.mysql.yml +++ b/misc/integrations/docker.mysql.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -17,7 +17,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.postgres.ui.yml b/misc/integrations/docker.postgres.ui.yml index f2ad84d6d..07f3c1618 100644 --- a/misc/integrations/docker.postgres.ui.yml +++ b/misc/integrations/docker.postgres.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -28,7 +28,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -49,7 +49,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 depends_on: - bw-docker environment: diff --git a/misc/integrations/docker.postgres.yml b/misc/integrations/docker.postgres.yml index 7bf97ba37..069a76523 100644 --- a/misc/integrations/docker.postgres.yml +++ b/misc/integrations/docker.postgres.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -17,7 +17,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/docker.ui.yml b/misc/integrations/docker.ui.yml index addf87104..dfa8993af 100644 --- a/misc/integrations/docker.ui.yml +++ b/misc/integrations/docker.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -23,7 +23,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker @@ -45,7 +45,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 depends_on: - bw-docker volumes: diff --git a/misc/integrations/docker.yml b/misc/integrations/docker.yml index 67ab3db09..7da82339e 100644 --- a/misc/integrations/docker.yml +++ b/misc/integrations/docker.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - 80:8080 - 443:8443 @@ -16,7 +16,7 @@ services: - bw-services bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 depends_on: - bunkerweb - bw-docker diff --git a/misc/integrations/k8s.mariadb.ui.yml b/misc/integrations/k8s.mariadb.ui.yml index 91d5134f6..b66e23c96 100644 --- a/misc/integrations/k8s.mariadb.ui.yml +++ b/misc/integrations/k8s.mariadb.ui.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -230,7 +230,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 imagePullPolicy: Always env: - name: ADMIN_USERNAME diff --git a/misc/integrations/k8s.mariadb.yml b/misc/integrations/k8s.mariadb.yml index 80a723726..075ab500b 100644 --- a/misc/integrations/k8s.mariadb.yml +++ b/misc/integrations/k8s.mariadb.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE diff --git a/misc/integrations/k8s.mysql.ui.yml b/misc/integrations/k8s.mysql.ui.yml index 8e9371368..518d87b49 100644 --- a/misc/integrations/k8s.mysql.ui.yml +++ b/misc/integrations/k8s.mysql.ui.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -230,7 +230,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 imagePullPolicy: Always env: - name: ADMIN_USERNAME diff --git a/misc/integrations/k8s.mysql.yml b/misc/integrations/k8s.mysql.yml index c163cb704..9d77a08b1 100644 --- a/misc/integrations/k8s.mysql.yml +++ b/misc/integrations/k8s.mysql.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -144,7 +144,7 @@ spec: spec: containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE diff --git a/misc/integrations/k8s.postgres.ui.yml b/misc/integrations/k8s.postgres.ui.yml index ce2a97668..135d7e239 100644 --- a/misc/integrations/k8s.postgres.ui.yml +++ b/misc/integrations/k8s.postgres.ui.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -145,7 +145,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-scheduler - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -230,7 +230,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-ui - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 imagePullPolicy: Always env: - name: ADMIN_USERNAME diff --git a/misc/integrations/k8s.postgres.yml b/misc/integrations/k8s.postgres.yml index f54b8af9e..ca75e2ea7 100644 --- a/misc/integrations/k8s.postgres.yml +++ b/misc/integrations/k8s.postgres.yml @@ -48,7 +48,7 @@ spec: containers: # using bunkerweb as name is mandatory - name: bunkerweb - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 imagePullPolicy: Always securityContext: runAsUser: 101 @@ -118,7 +118,7 @@ spec: serviceAccountName: sa-bunkerweb containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE @@ -144,7 +144,7 @@ spec: spec: containers: - name: bunkerweb-controller - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 imagePullPolicy: Always env: - name: KUBERNETES_MODE diff --git a/misc/integrations/swarm.mariadb.ui.yml b/misc/integrations/swarm.mariadb.ui.yml index 860c9173f..57c48666b 100644 --- a/misc/integrations/swarm.mariadb.ui.yml +++ b/misc/integrations/swarm.mariadb.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -59,7 +59,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -86,7 +86,7 @@ services: - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 environment: - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.mariadb.yml b/misc/integrations/swarm.mariadb.yml index 90d0a7d4d..e95af2ef6 100644 --- a/misc/integrations/swarm.mariadb.yml +++ b/misc/integrations/swarm.mariadb.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -63,7 +63,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.mysql.ui.yml b/misc/integrations/swarm.mysql.ui.yml index 311b3a99b..b3401a304 100644 --- a/misc/integrations/swarm.mysql.ui.yml +++ b/misc/integrations/swarm.mysql.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -59,7 +59,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -86,7 +86,7 @@ services: - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 environment: - DATABASE_URI=mariadb+pymysql://bunkerweb:changeme@bw-db:3306/db # Remember to set a stronger password for the database - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.mysql.yml b/misc/integrations/swarm.mysql.yml index bd9ac4286..e46142a7c 100644 --- a/misc/integrations/swarm.mysql.yml +++ b/misc/integrations/swarm.mysql.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -59,7 +59,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.postgres.ui.yml b/misc/integrations/swarm.postgres.ui.yml index 532eb58da..9f9513809 100644 --- a/misc/integrations/swarm.postgres.ui.yml +++ b/misc/integrations/swarm.postgres.ui.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -59,7 +59,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -85,7 +85,7 @@ services: - bw-universe bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 environment: - DATABASE_URI=postgresql://bunkerweb:changeme@bw-db:5432/db - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/integrations/swarm.postgres.yml b/misc/integrations/swarm.postgres.yml index 0936527fc..908308bc7 100644 --- a/misc/integrations/swarm.postgres.yml +++ b/misc/integrations/swarm.postgres.yml @@ -2,7 +2,7 @@ version: "3.5" services: bunkerweb: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 ports: - published: 80 target: 8080 @@ -32,7 +32,7 @@ services: - "bunkerweb.INSTANCE" bw-autoconf: - image: bunkerity/bunkerweb-autoconf:1.5.0-beta + image: bunkerity/bunkerweb-autoconf:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 @@ -59,7 +59,7 @@ services: - "node.role == manager" bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 environment: - SWARM_MODE=yes - DOCKER_HOST=tcp://bw-docker:2375 diff --git a/misc/update-version.sh b/misc/update-version.sh index 5de4577d0..a5ffab00b 100755 --- a/misc/update-version.sh +++ b/misc/update-version.sh @@ -5,8 +5,6 @@ if [ $# -ne 1 ] ; then exit 1 fi - - OLD_VERSION="$(cat src/VERSION | tr -d '\n' | sed 's/\./\\./g' | sed 's/\-/\\-/g')" NEW_VERSION="$(echo -n "$1" | sed 's/\./\\./g' | sed 's/\-/\\-/g')" @@ -19,5 +17,11 @@ for example in examples/* ; do sed -i "s@${OLD_VERSION}@${NEW_VERSION}@g" ${example}/*.yml done # docs -# TODO : replace X.Y.Z_beta with X.Y.Z-beta (rpm install) -sed -i "s@${OLD_VERSION}@${NEW_VERSION}@g" docs/*.md \ No newline at end of file +sed -i "s@${OLD_VERSION}@${NEW_VERSION}@g" docs/*.md +# README +sed -i "s@${OLD_VERSION}@${NEW_VERSION}@g" README.md +# tests +sed -i "s@${OLD_VERSION}@${NEW_VERSION}@g" tests/ui/docker-compose.yml +for test in tests/core/* ; do + sed -i "s@${OLD_VERSION}@${NEW_VERSION}@g" ${test}/docker-compose.yml +done \ No newline at end of file diff --git a/src/VERSION b/src/VERSION index fbba4fcda..3e1ad720b 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.5.0-beta \ No newline at end of file +1.5.0 \ No newline at end of file diff --git a/src/linux/scripts/start.sh b/src/linux/scripts/start.sh index b75d68afa..07df62b5f 100644 --- a/src/linux/scripts/start.sh +++ b/src/linux/scripts/start.sh @@ -85,7 +85,7 @@ function start() { # Create dummy variables.env if [ ! -f /etc/bunkerweb/variables.env ]; then - sudo -E -u nginx -g nginx /bin/bash -c "echo -ne '\# remove IS_LOADING=yes when your config is ready\nIS_LOADING=yes\nHTTP_PORT=80\nHTTPS_PORT=443\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n' > /etc/bunkerweb/variables.env" + sudo -E -u nginx -g nginx /bin/bash -c "echo -ne '# remove IS_LOADING=yes when your config is ready\nIS_LOADING=yes\nHTTP_PORT=80\nHTTPS_PORT=443\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n' > /etc/bunkerweb/variables.env" log "SYSTEMCTL" "ℹ️" "Created dummy variables.env file" fi @@ -105,7 +105,7 @@ function start() { HTTPS_PORT="8443" fi sudo -E -u nginx -g nginx /bin/bash -c "echo -ne 'IS_LOADING=yes\nHTTP_PORT=${HTTP_PORT}\nHTTPS_PORT=${HTTPS_PORT}\nAPI_LISTEN_IP=127.0.0.1\nSERVER_NAME=\n' > /var/tmp/bunkerweb/tmp.env" - sudo -E -u nginx -g nginx /bin/bash -c "/usr/share/bunkerweb/gen/main.py --variables /var/tmp/bunkerweb/tmp.env --no-linux-reload" + sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=/usr/share/bunkerweb/deps/python/ /usr/share/bunkerweb/gen/main.py --variables /var/tmp/bunkerweb/tmp.env --no-linux-reload" if [ $? -ne 0 ] ; then log "SYSTEMCTL" "❌" "Error while generating config from /var/tmp/bunkerweb/tmp.env" exit 1 @@ -137,9 +137,9 @@ function start() { # Update database log "SYSTEMCTL" "ℹ️" "Updating database ..." if [ ! -f /var/lib/bunkerweb/db.sqlite3 ]; then - sudo -E -u nginx -g nginx /bin/bash -c "/usr/share/bunkerweb/gen/save_config.py --variables /etc/bunkerweb/variables.env --init" + sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=/usr/share/bunkerweb/deps/python/ /usr/share/bunkerweb/gen/save_config.py --variables /etc/bunkerweb/variables.env --init" else - sudo -E -u nginx -g nginx /bin/bash -c "/usr/share/bunkerweb/gen/save_config.py --variables /etc/bunkerweb/variables.env" + sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=/usr/share/bunkerweb/deps/python/ /usr/share/bunkerweb/gen/save_config.py --variables /etc/bunkerweb/variables.env" fi if [ $? -ne 0 ] ; then log "SYSTEMCTL" "❌" "save_config failed" @@ -149,7 +149,7 @@ else # Execute scheduler log "SYSTEMCTL" "ℹ️ " "Executing scheduler ..." - sudo -E -u nginx -g nginx /bin/bash -c "/usr/share/bunkerweb/scheduler/main.py --variables /etc/bunkerweb/variables.env" + sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=/usr/share/bunkerweb/deps/python/ /usr/share/bunkerweb/scheduler/main.py --variables /etc/bunkerweb/variables.env" if [ "$?" -ne 0 ] ; then log "SYSTEMCTL" "❌" "Scheduler failed" exit 1 diff --git a/tests/core/antibot/docker-compose.yml b/tests/core/antibot/docker-compose.yml index 06b9b8b9e..50233a007 100644 --- a/tests/core/antibot/docker-compose.yml +++ b/tests/core/antibot/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/authbasic/docker-compose.yml b/tests/core/authbasic/docker-compose.yml index 3fdfa0ad8..77da979c5 100644 --- a/tests/core/authbasic/docker-compose.yml +++ b/tests/core/authbasic/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/badbehavior/docker-compose.yml b/tests/core/badbehavior/docker-compose.yml index ec3629b2e..f0a8ac304 100644 --- a/tests/core/badbehavior/docker-compose.yml +++ b/tests/core/badbehavior/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/blacklist/docker-compose.yml b/tests/core/blacklist/docker-compose.yml index 1d8a45dee..7ba6a2c95 100644 --- a/tests/core/blacklist/docker-compose.yml +++ b/tests/core/blacklist/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -45,7 +45,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/brotli/docker-compose.yml b/tests/core/brotli/docker-compose.yml index f6e103c9a..2631f3a50 100644 --- a/tests/core/brotli/docker-compose.yml +++ b/tests/core/brotli/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -24,7 +24,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/bunkernet/docker-compose.yml b/tests/core/bunkernet/docker-compose.yml index 89b5f6e60..3d1c91516 100644 --- a/tests/core/bunkernet/docker-compose.yml +++ b/tests/core/bunkernet/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -23,7 +23,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/bwcli/docker-compose.yml b/tests/core/bwcli/docker-compose.yml index 52fecbd38..23b435453 100644 --- a/tests/core/bwcli/docker-compose.yml +++ b/tests/core/bwcli/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never depends_on: - bw-redis @@ -19,7 +19,7 @@ services: - bw-universe bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/clientcache/docker-compose.yml b/tests/core/clientcache/docker-compose.yml index e6714a462..bb1e33abf 100644 --- a/tests/core/clientcache/docker-compose.yml +++ b/tests/core/clientcache/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never ports: - 80:80 @@ -28,7 +28,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/cors/docker-compose.yml b/tests/core/cors/docker-compose.yml index 5f7ea2e00..7490ddac0 100644 --- a/tests/core/cors/docker-compose.yml +++ b/tests/core/cors/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -33,7 +33,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/country/docker-compose.yml b/tests/core/country/docker-compose.yml index ef3e5be1f..7f3da613b 100644 --- a/tests/core/country/docker-compose.yml +++ b/tests/core/country/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -26,7 +26,7 @@ services: ipv4_address: 2.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/customcert/docker-compose.yml b/tests/core/customcert/docker-compose.yml index 7697758ca..2fab52fce 100644 --- a/tests/core/customcert/docker-compose.yml +++ b/tests/core/customcert/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never ports: - 80:80 @@ -29,7 +29,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/db/docker-compose.yml b/tests/core/db/docker-compose.yml index dc4215d34..f88647005 100644 --- a/tests/core/db/docker-compose.yml +++ b/tests/core/db/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -24,7 +24,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/dnsbl/docker-compose.yml b/tests/core/dnsbl/docker-compose.yml index 768bee0ca..4c2b6a22e 100644 --- a/tests/core/dnsbl/docker-compose.yml +++ b/tests/core/dnsbl/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never ports: - 80:80 @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/errors/docker-compose.yml b/tests/core/errors/docker-compose.yml index ccfdc413c..95cbc2ea6 100644 --- a/tests/core/errors/docker-compose.yml +++ b/tests/core/errors/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/greylist/docker-compose.yml b/tests/core/greylist/docker-compose.yml index 03d2e928d..b497aeacf 100644 --- a/tests/core/greylist/docker-compose.yml +++ b/tests/core/greylist/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -35,7 +35,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/gzip/docker-compose.yml b/tests/core/gzip/docker-compose.yml index 6c2a94930..739e4b8e7 100644 --- a/tests/core/gzip/docker-compose.yml +++ b/tests/core/gzip/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -24,7 +24,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/headers/docker-compose.yml b/tests/core/headers/docker-compose.yml index 606245451..4bef52c51 100644 --- a/tests/core/headers/docker-compose.yml +++ b/tests/core/headers/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -38,7 +38,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/inject/docker-compose.yml b/tests/core/inject/docker-compose.yml index 15686e92f..63dc09c8c 100644 --- a/tests/core/inject/docker-compose.yml +++ b/tests/core/inject/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -23,7 +23,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/limit/docker-compose.yml b/tests/core/limit/docker-compose.yml index e50cba098..1ab5decff 100644 --- a/tests/core/limit/docker-compose.yml +++ b/tests/core/limit/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/misc/docker-compose.yml b/tests/core/misc/docker-compose.yml index faa3e37b3..7c9fa170f 100644 --- a/tests/core/misc/docker-compose.yml +++ b/tests/core/misc/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -35,7 +35,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/modsecurity/docker-compose.yml b/tests/core/modsecurity/docker-compose.yml index 32599202d..901adb9c2 100644 --- a/tests/core/modsecurity/docker-compose.yml +++ b/tests/core/modsecurity/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/redirect/docker-compose.yml b/tests/core/redirect/docker-compose.yml index adfc45e5a..c48eca227 100644 --- a/tests/core/redirect/docker-compose.yml +++ b/tests/core/redirect/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never ports: - 80:80 @@ -27,7 +27,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/redis/docker-compose.yml b/tests/core/redis/docker-compose.yml index 9e46e38c4..40c3d79bd 100644 --- a/tests/core/redis/docker-compose.yml +++ b/tests/core/redis/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never depends_on: - bw-redis @@ -35,7 +35,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/reversescan/docker-compose.yml b/tests/core/reversescan/docker-compose.yml index 078d0fbfe..9714d5095 100644 --- a/tests/core/reversescan/docker-compose.yml +++ b/tests/core/reversescan/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/selfsigned/docker-compose.yml b/tests/core/selfsigned/docker-compose.yml index d822fc850..b5bde83bf 100644 --- a/tests/core/selfsigned/docker-compose.yml +++ b/tests/core/selfsigned/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -26,7 +26,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/sessions/docker-compose.yml b/tests/core/sessions/docker-compose.yml index 1a35a6646..7d49ac4bd 100644 --- a/tests/core/sessions/docker-compose.yml +++ b/tests/core/sessions/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -25,7 +25,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/core/whitelist/docker-compose.yml b/tests/core/whitelist/docker-compose.yml index 06e065287..5bc40ef84 100644 --- a/tests/core/whitelist/docker-compose.yml +++ b/tests/core/whitelist/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never labels: - "bunkerweb.INSTANCE" @@ -38,7 +38,7 @@ services: ipv4_address: 1.0.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw diff --git a/tests/ui/docker-compose.yml b/tests/ui/docker-compose.yml index 1e9b59155..3e0d13aec 100644 --- a/tests/ui/docker-compose.yml +++ b/tests/ui/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: bw: - image: bunkerity/bunkerweb:1.5.0-beta + image: bunkerity/bunkerweb:1.5.0 pull_policy: never ports: - 80:80 @@ -34,7 +34,7 @@ services: ipv4_address: 192.168.0.2 bw-scheduler: - image: bunkerity/bunkerweb-scheduler:1.5.0-beta + image: bunkerity/bunkerweb-scheduler:1.5.0 pull_policy: never depends_on: - bw @@ -47,7 +47,7 @@ services: - bw-docker bw-ui: - image: bunkerity/bunkerweb-ui:1.5.0-beta + image: bunkerity/bunkerweb-ui:1.5.0 pull_policy: never depends_on: - bw