diff --git a/local-build.sh b/local-build.sh index 4b1e94e..2fe3332 100755 --- a/local-build.sh +++ b/local-build.sh @@ -23,41 +23,41 @@ export ACMESH_GOLANG_IMAGE="${DOCKER_IMAGE}:acmesh-golang" # Builds echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}latest ${CYAN}...${RESET}" -docker build \ +sudo docker build \ --pull \ - --build-arg OPENRESTY_VERSION \ - --build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION \ - --build-arg LUA_VERSION \ - --build-arg LUAROCKS_VERSION \ + --build-arg OPENRESTY_VERSION=$OPENRESTY_VERSION \ + --build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION=$CROWDSEC_OPENRESTY_BOUNCER_VERSION \ + --build-arg LUA_VERSION=$LUA_VERSION \ + --build-arg LUAROCKS_VERSION=$LUAROCKS_VERSION \ -t "$BASE_IMAGE" \ -f docker/Dockerfile \ . -echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}" -docker build \ - --build-arg BASE_IMAGE \ - -t "$ACMESH_IMAGE" \ - -f docker/Dockerfile.acmesh \ - . +# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}" +# docker build \ +# --build-arg BASE_IMAGE \ +# -t "$ACMESH_IMAGE" \ +# -f docker/Dockerfile.acmesh \ +# . echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot ${CYAN}...${RESET}" -docker build \ - --build-arg BASE_IMAGE \ +sudo docker build \ + --build-arg BASE_IMAGE=$BASE_IMAGE \ -t "$CERTBOT_IMAGE" \ -f docker/Dockerfile.certbot \ . -echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}" -docker build \ - --build-arg ACMESH_IMAGE \ - -t "$ACMESH_GOLANG_IMAGE" \ - -f docker/Dockerfile.acmesh-golang \ - . +# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}" +# docker build \ +# --build-arg ACMESH_IMAGE \ +# -t "$ACMESH_GOLANG_IMAGE" \ +# -f docker/Dockerfile.acmesh-golang \ +# . echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot-node ${CYAN}...${RESET}" -docker build \ - --build-arg CERTBOT_IMAGE \ - -t "$CERTBOT_NODE_IMAGE" \ +sudo docker build \ + --build-arg CERTBOT_IMAGE=$CERTBOT_IMAGE \ + -t "kustom-local-nginx-full:certbot-node" \ -f docker/Dockerfile.certbot-node \ . diff --git a/local-buildx.sh b/local-buildx.sh index dbf2862..89f7eff 100755 --- a/local-buildx.sh +++ b/local-buildx.sh @@ -7,7 +7,7 @@ GREEN='\E[1;32m' RESET='\E[0m' DOCKER_IMAGE="${REGISTRY:-}nginxproxymanager/nginx-full" -PLATFORMS=linux/amd64,linux/arm64,linux/arm/7 +PLATFORMS=linux/arm64 export OPENRESTY_VERSION=1.25.3.2 export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7 @@ -22,7 +22,7 @@ export ACMESH_GOLANG_IMAGE="${DOCKER_IMAGE}:acmesh-golang" # Setup -docker buildx rm "${BUILDX_NAME:-nginx-full}" || echo +# docker buildx rm "${BUILDX_NAME:-nginx-full}" || echo docker buildx create --name "${BUILDX_NAME:-nginx-full}" || echo docker buildx use "${BUILDX_NAME:-nginx-full}" @@ -33,55 +33,57 @@ docker buildx build \ --platform "$PLATFORMS" \ --progress plain \ --pull \ - --push \ - --build-arg OPENRESTY_VERSION \ - --build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION \ - --build-arg LUA_VERSION \ - --build-arg LUAROCKS_VERSION \ + --load \ + --build-arg OPENRESTY_VERSION=$OPENRESTY_VERSION \ + --build-arg CROWDSEC_OPENRESTY_BOUNCER_VERSION=$CROWDSEC_OPENRESTY_BOUNCER_VERSION \ + --build-arg LUA_VERSION=$LUA_VERSION \ + --build-arg LUAROCKS_VERSION=$LUAROCKS_VERSION \ -t "$BASE_IMAGE" \ -f docker/Dockerfile \ . -echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}" -docker buildx build \ - --platform "$PLATFORMS" \ - --progress plain \ - --push \ - --build-arg BASE_IMAGE \ - -t "$ACMESH_IMAGE" \ - -f docker/Dockerfile.acmesh \ - . +# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh ${CYAN}...${RESET}" +# docker buildx build \ +# --platform "$PLATFORMS" \ +# --progress plain \ +# --push \ +# --build-arg BASE_IMAGE \ +# -t "$ACMESH_IMAGE" \ +# -f docker/Dockerfile.acmesh \ +# . echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot ${CYAN}...${RESET}" docker buildx build \ --platform "$PLATFORMS" \ --progress plain \ - --push \ - --build-arg BASE_IMAGE \ + --load \ + --no-cache \ + --build-arg BASE_IMAGE=$BASE_IMAGE \ -t "$CERTBOT_IMAGE" \ -f docker/Dockerfile.certbot \ . -echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}" -docker buildx build \ - --platform "$PLATFORMS" \ - --progress plain \ - --push \ - --build-arg ACMESH_IMAGE \ - -t "$ACMESH_GOLANG_IMAGE" \ - -f docker/Dockerfile.acmesh-golang \ - . +# echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}acmesh-golang ${CYAN}...${RESET}" +# docker buildx build \ +# --platform "$PLATFORMS" \ +# --progress plain \ +# --push \ +# --build-arg ACMESH_IMAGE \ +# -t "$ACMESH_GOLANG_IMAGE" \ +# -f docker/Dockerfile.acmesh-golang \ +# . echo -e "${BLUE}❯ ${CYAN}Building ${YELLOW}certbot-node ${CYAN}...${RESET}" docker buildx build \ --platform "$PLATFORMS" \ --progress plain \ - --push \ - --build-arg CERTBOT_IMAGE \ + --load \ + --no-cache \ + --build-arg CERTBOT_IMAGE=$CERTBOT_IMAGE \ -t "$CERTBOT_NODE_IMAGE" \ -f docker/Dockerfile.certbot-node \ . -docker buildx rm "${BUILDX_NAME:-nginx-full}" +# docker buildx rm "${BUILDX_NAME:-nginx-full}" echo -e "${BLUE}❯ ${GREEN}All done!${RESET}" diff --git a/scripts/build-openresty b/scripts/build-openresty index 9f3a1bb..c95cf24 100755 --- a/scripts/build-openresty +++ b/scripts/build-openresty @@ -14,6 +14,8 @@ tar -xzf openresty-${OPENRESTY_VERSION}.tar.gz mv /tmp/openresty-${OPENRESTY_VERSION} /tmp/openresty git clone https://github.com/leev/ngx_http_geoip2_module.git mv /tmp/ngx_http_geoip2_module /tmp/openresty/ngx_http_geoip2_module +git clone https://github.com/vozlt/nginx-module-vts.git +mv /tmp/nginx-module-vts /tmp/openresty/nginx-module-vts cd /tmp/openresty ./configure \ @@ -55,6 +57,7 @@ cd /tmp/openresty --with-stream_realip_module \ --with-stream_ssl_module \ --with-stream_ssl_preread_module \ + --add-module=/tmp/openresty/nginx-module-vts \ --add-dynamic-module=/tmp/openresty/ngx_http_geoip2_module make -j2 diff --git a/scripts/fix-nginx.sh b/scripts/fix-nginx.sh new file mode 100644 index 0000000..ed77d86 --- /dev/null +++ b/scripts/fix-nginx.sh @@ -0,0 +1,19 @@ +#!/bin/bash -e + +mkdir -p var/log/nginx +touch var/log/nginx/error.log + +useradd -s /bin/false nginx + +mkdir -p /var/cache/nginx/client_temp + +apt update && apt install -y vim + +vim /etc/nginx/nginx.conf + +# vhost_traffic_status_zone; + +# location /status { +# vhost_traffic_status_display; +# vhost_traffic_status_display_format html; +# } \ No newline at end of file