From 6bb6facd88dafe3af6a043bf9e5386938a9ab736 Mon Sep 17 00:00:00 2001 From: bunkerity Date: Tue, 22 Jun 2021 10:16:20 +0200 Subject: [PATCH] add load: true when autobuilding images and move from /bin/sh to /bin/bash --- .github/workflows/build-bunkerized-nginx-autoconf.yml | 2 ++ .github/workflows/build-bunkerized-nginx-ui.yml | 2 ++ .github/workflows/build-bunkerized-nginx.yml | 2 ++ entrypoint/certbot.sh | 2 +- scripts/abusers.sh | 2 +- scripts/certbot-new.sh | 2 +- scripts/certbot-renew-hook.sh | 2 +- scripts/certbot-renew.sh | 2 +- scripts/exit-nodes.sh | 2 +- scripts/geoip.sh | 2 +- scripts/proxies.sh | 2 +- scripts/referrers.sh | 2 +- scripts/user-agents.sh | 2 +- 13 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-bunkerized-nginx-autoconf.yml b/.github/workflows/build-bunkerized-nginx-autoconf.yml index 3279cb129..f48be0922 100644 --- a/.github/workflows/build-bunkerized-nginx-autoconf.yml +++ b/.github/workflows/build-bunkerized-nginx-autoconf.yml @@ -45,6 +45,7 @@ jobs: context: . file: autoconf/Dockerfile platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 + load: true push: false tags: bunkerized-nginx-autoconf cache-from: type=local,src=/tmp/.buildx-cache @@ -63,6 +64,7 @@ jobs: context: . file: autoconf/Dockerfile platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 + load: true push: false tags: bunkerized-nginx-autoconf cache-to: type=local,dest=/tmp/.buildx-cache-master diff --git a/.github/workflows/build-bunkerized-nginx-ui.yml b/.github/workflows/build-bunkerized-nginx-ui.yml index 3d59c7967..9f1add8e7 100644 --- a/.github/workflows/build-bunkerized-nginx-ui.yml +++ b/.github/workflows/build-bunkerized-nginx-ui.yml @@ -45,6 +45,7 @@ jobs: context: . file: ui/Dockerfile platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 + load: true push: false tags: bunkerized-nginx-ui cache-from: type=local,src=/tmp/.buildx-cache @@ -63,6 +64,7 @@ jobs: context: . file: ui/Dockerfile platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 + load: true push: false tags: bunkerized-nginx-ui cache-to: type=local,dest=/tmp/.buildx-cache-master diff --git a/.github/workflows/build-bunkerized-nginx.yml b/.github/workflows/build-bunkerized-nginx.yml index a7908e7ac..0eaa40794 100644 --- a/.github/workflows/build-bunkerized-nginx.yml +++ b/.github/workflows/build-bunkerized-nginx.yml @@ -44,6 +44,7 @@ jobs: with: context: . platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 + load: true push: false tags: bunkerized-nginx cache-from: type=local,src=/tmp/.buildx-cache @@ -61,6 +62,7 @@ jobs: with: context: . platforms: linux/amd64,linux/386,linux/arm/v7,linux/arm64/v8 + load: true push: false tags: bunkerized-nginx cache-to: type=local,dest=/tmp/.buildx-cache-master diff --git a/entrypoint/certbot.sh b/entrypoint/certbot.sh index 7892959c7..cc8fad62e 100644 --- a/entrypoint/certbot.sh +++ b/entrypoint/certbot.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/abusers.sh b/scripts/abusers.sh index ec128a1d7..1ada94737 100755 --- a/scripts/abusers.sh +++ b/scripts/abusers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/certbot-new.sh b/scripts/certbot-new.sh index 4c18de5a8..eafd9a452 100644 --- a/scripts/certbot-new.sh +++ b/scripts/certbot-new.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # generate certificate certbot certonly --webroot -w /opt/bunkerized-nginx/acme-challenge -n -d "$1" --email "$2" --agree-tos diff --git a/scripts/certbot-renew-hook.sh b/scripts/certbot-renew-hook.sh index e382b1110..0b16d3de1 100644 --- a/scripts/certbot-renew-hook.sh +++ b/scripts/certbot-renew-hook.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/certbot-renew.sh b/scripts/certbot-renew.sh index 4724342a4..84faae4fb 100644 --- a/scripts/certbot-renew.sh +++ b/scripts/certbot-renew.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/exit-nodes.sh b/scripts/exit-nodes.sh index 95f8d8f7c..6f7cbe499 100644 --- a/scripts/exit-nodes.sh +++ b/scripts/exit-nodes.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/geoip.sh b/scripts/geoip.sh index 5e5b89e97..78bb6ff5a 100644 --- a/scripts/geoip.sh +++ b/scripts/geoip.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/proxies.sh b/scripts/proxies.sh index 9728b0fbf..c16f22d20 100755 --- a/scripts/proxies.sh +++ b/scripts/proxies.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/referrers.sh b/scripts/referrers.sh index 088c5ad97..c37d52781 100755 --- a/scripts/referrers.sh +++ b/scripts/referrers.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh diff --git a/scripts/user-agents.sh b/scripts/user-agents.sh index 92bc92d8b..cd8c2a4b5 100755 --- a/scripts/user-agents.sh +++ b/scripts/user-agents.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # load some functions . /opt/bunkerized-nginx/entrypoint/utils.sh