Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -311,8 +311,8 @@ fix: ## fix trivial linting error automatically
${DOCKER_COMPOSE_TOOLS_CMD} run --rm tools bin/lint.sh ${pysrcdirs}

check-gixy: env=test
check-gixy: ## run nginx config check
${DOCKER_COMPOSE_CMD} exec webserver /opt/gixy/bin/gixy /etc/nginx/nginx.conf
check-gixy: ## run nginx config check, skip the checks HSTS max-age=0 and header redefinitions
${DOCKER_COMPOSE_CMD} exec webserver /opt/gixy/bin/gixy --skips hsts_header,add_header_redefinition /etc/nginx/nginx.conf

build-tools tools-build: ## build tools image
${DOCKER_COMPOSE_TOOLS_CMD} build tools
Expand Down
4 changes: 3 additions & 1 deletion docker/webserver.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
ARG CERTBOT_VERSION=5.6.0
ARG GIXY_NG_VERSION=0.2.48

FROM nginx:1.31.2-alpine3.23

Expand All @@ -15,7 +16,8 @@ RUN apk upgrade --no-cache \

# install nginx config static analysis tool
RUN python3 -m venv /opt/gixy
RUN /opt/gixy/bin/pip install gixy==0.1.21
ARG GIXY_NG_VERSION
RUN /opt/gixy/bin/pip install gixy-ng==${GIXY_NG_VERSION}

# install certbot
RUN python3 -m venv /opt/certbot
Expand Down
Loading