Skip to content

Add nginx-module-vts #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add nginx-module-vts #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3380c7a
Add nginx-module-vts
kevintomsgithub Sep 28, 2024
20235db
Comment other builds to only create certbot-node
kevintomsgithub Sep 28, 2024
f8ad816
Fix nginx script
kevintomsgithub Sep 30, 2024
272a4f2
Comment out unwanted versions
kevintomsgithub Sep 30, 2024
d3724f7
temp fix buildx
kevintomsgithub Sep 30, 2024
8919ed5
Update certbot-node tagname
kevintomsgithub Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions local-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
.

Expand Down
62 changes: 32 additions & 30 deletions local-buildx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"

Expand All @@ -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}"
3 changes: 3 additions & 0 deletions scripts/build-openresty
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
19 changes: 19 additions & 0 deletions scripts/fix-nginx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
# }