diff --git a/extenginx/Containerfile b/extenginx/Containerfile index 9b9769da..8de7f1be 100644 --- a/extenginx/Containerfile +++ b/extenginx/Containerfile @@ -3,7 +3,8 @@ ARG NGINX_RUNTIME_SNIPPETS=0 FROM alpine:3.19 AS build RUN apk update && apk upgrade && apk add \ - envsubst + envsubst \ + ; COPY nginx.conf.template . @@ -19,7 +20,8 @@ FROM alpine:3.19 AS nginx-runtime-0 RUN apk update && apk upgrade && apk add \ nginx \ - nginx-mod-mail + nginx-mod-mail \ + ; RUN mkdir -p \ @@ -30,7 +32,8 @@ RUN mkdir -p \ /etc/nginx/include.d/server_http \ /etc/nginx/include.d/mail \ /etc/nginx/include.d/server_smtps \ - /etc/nginx/include.d/server_pop3s + /etc/nginx/include.d/server_pop3s \ + ; COPY --from=NGINX_SNIPPET_SOURCE . /etc/nginx/include.d/ diff --git a/orbit/Containerfile b/orbit/Containerfile index 3c805a21..ee16a9be 100644 --- a/orbit/Containerfile +++ b/orbit/Containerfile @@ -5,12 +5,14 @@ RUN apk update && apk upgrade && apk add \ py3-pip \ sqlite \ build-base \ - libffi-dev + libffi-dev \ + ; COPY requirements.txt /requirements.txt RUN python3 -m venv /radius-venv && \ source /radius-venv/bin/activate && \ - pip install -r requirements.txt + pip install -r requirements.txt && \ + : COPY . /orbit WORKDIR /orbit @@ -21,7 +23,8 @@ FROM alpine:3.19 AS orbit RUN apk update && apk upgrade && apk add \ python3 \ - cgit + cgit \ + ; COPY --from=build /orbit /orbit COPY --from=build /radius-venv /radius-venv