From 4a699ef6c6710ef2ca27681ca51ae255e92444e3 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 26 Jun 2022 16:50:55 +0200 Subject: [PATCH] fix missing local Linux images import in ci/cd, and fix bug related to jobs in Linux integration --- .github/workflows/dev.yml | 8 ++++++++ CHANGELOG.md | 2 +- linux/scripts/start.sh | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 7847f2c1..77474f29 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -326,6 +326,14 @@ jobs: run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-autoconf-tests-amd64:latest 10.20.1.1:5000/bw-autoconf-tests:latest && docker push 10.20.1.1:5000/bw-autoconf-tests:latest - name: Import BW UI image run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ui-tests-amd64:latest 10.20.1.1:5000/bw-ui-tests:latest && docker push 10.20.1.1:5000/bw-ui-tests:latest + - name: Import Ubuntu image + run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-ubuntu:latest bw-ubuntu-tests:latest + - name: Import Debian image + run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-debian:latest bw-debian-tests:latest + - name: Import Centos image + run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-centos:latest bw-centos-tests:latest + - name: Import Fedora image + run: docker pull ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest && docker tag ${{ secrets.PRIVATE_REGISTRY }}/infra/bunkerweb-fedora:latest bw-fedora-tests:latest # CVE check on OS - name: Check security vulnerabilities for BW diff --git a/CHANGELOG.md b/CHANGELOG.md index e52f66c9..41e3af3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## v1.4.2 - +## v1.4.2 - - Fix bwcli unban command when using Linux integration - Fix permissions check when filename has a space diff --git a/linux/scripts/start.sh b/linux/scripts/start.sh index 7a378c6a..4f199195 100644 --- a/linux/scripts/start.sh +++ b/linux/scripts/start.sh @@ -46,7 +46,7 @@ function start() { # STEP1 # # Generate variables.env files to /tmp/ # ############################################# - printf "HTTP_PORT=80\nSERVER_NAME=example.com\nTEMP_NGINX=yes\nUSE_BUNKERNET=no" > "/tmp/variables.env" + printf "HTTP_PORT=80\nSERVER_NAME=example.com\nTEMP_NGINX=yes" > "/tmp/variables.env" # Test if command worked check_ok # Exit if failed @@ -91,7 +91,7 @@ function start() { # STEP4 # # Run jobs script # ############################################# - /opt/bunkerweb/job/main.py --variables /etc/nginx/variables.env --run + /opt/bunkerweb/job/main.py --variables /opt/bunkerweb/variables.env --run # Test if command worked check_ok # Exit if failed