Skip to content
Merged
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
6 changes: 3 additions & 3 deletions container-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
build:
context: extenginx
additional_contexts:
- NGINX_SNIPPET_SOURCE=./nginx_snippets
- nginx_snippet_source=./nginx_snippets
dockerfile: Containerfile
target: nginx
args:
Expand Down Expand Up @@ -91,7 +91,7 @@ services:
context: smtp
dockerfile: Containerfile
additional_contexts:
- TCP_SERVER_SOURCE=./tcp_server
- tcp_server_source=./tcp_server
target: smtp
args:
hostname: localhost
Expand All @@ -109,7 +109,7 @@ services:
context: pop
dockerfile: Containerfile
additional_contexts:
- TCP_SERVER_SOURCE=./tcp_server
- tcp_server_source=./tcp_server
target: pop
args:
LISTEN_PORT: 1995
Expand Down
6 changes: 3 additions & 3 deletions container-compose-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
build:
context: extenginx
additional_contexts:
- NGINX_SNIPPET_SOURCE=./nginx_snippets
- nginx_snippet_source=./nginx_snippets
dockerfile: Containerfile
target: nginx
args:
Expand Down Expand Up @@ -81,7 +81,7 @@ services:
context: smtp
dockerfile: Containerfile
additional_contexts:
- TCP_SERVER_SOURCE=./tcp_server
- tcp_server_source=./tcp_server
target: smtp
args:
hostname: dev.underground.software
Expand All @@ -99,7 +99,7 @@ services:
context: pop
dockerfile: Containerfile
additional_contexts:
- TCP_SERVER_SOURCE=./tcp_server
- tcp_server_source=./tcp_server
target: pop
args:
LISTEN_PORT: 1995
Expand Down
6 changes: 3 additions & 3 deletions container-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
build:
context: extenginx
additional_contexts:
- NGINX_SNIPPET_SOURCE=./nginx_snippets
- nginx_snippet_source=./nginx_snippets
dockerfile: Containerfile
target: nginx
args:
Expand Down Expand Up @@ -81,7 +81,7 @@ services:
context: smtp
dockerfile: Containerfile
additional_contexts:
- TCP_SERVER_SOURCE=./tcp_server
- tcp_server_source=./tcp_server
target: smtp
args:
hostname: kdlp.underground.software
Expand All @@ -99,7 +99,7 @@ services:
context: pop
dockerfile: Containerfile
additional_contexts:
- TCP_SERVER_SOURCE=./tcp_server
- tcp_server_source=./tcp_server
target: pop
args:
LISTEN_PORT: 1995
Expand Down
2 changes: 1 addition & 1 deletion extenginx/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ RUN mkdir -p \
/etc/nginx/include.d/server_pop3s \
;

COPY --from=NGINX_SNIPPET_SOURCE . /etc/nginx/include.d/
COPY --from=nginx_snippet_source . /etc/nginx/include.d/

COPY --from=build nginx.conf /etc/nginx/

Expand Down
2 changes: 1 addition & 1 deletion pop/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add \
make \
;

COPY --from=TCP_SERVER_SOURCE . /tcp_server
COPY --from=tcp_server_source . /tcp_server
ARG LISTEN_PORT=995
RUN make -C /tcp_server CC='clang -static' DEFAULT_PORT=${LISTEN_PORT}

Expand Down
2 changes: 1 addition & 1 deletion smtp/Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ RUN apk add \
make \
;

COPY --from=TCP_SERVER_SOURCE . /tcp_server
COPY --from=tcp_server_source . /tcp_server
ARG LISTEN_PORT=465
RUN make -C /tcp_server CC='clang -static' DEFAULT_PORT=${LISTEN_PORT}

Expand Down