Skip to content

Remove host port mappings for backend containers and isolate them with networks #53

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

Merged
theyoyojo merged 8 commits into from
Mar 26, 2024
Merged

Remove host port mappings for backend containers and isolate them with networks #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e3b66a
container-compose: add dependency from nginx to other containers
charliemirabile Mar 26, 2024
2f8db7d
nginx: connect directly to orbit container instead of host
charliemirabile Mar 26, 2024
7d7d095
container-compose: remove host port mapping for orbit
charliemirabile Mar 25, 2024
36d42d7
nginx: connect directly to pop container instead of host
charliemirabile Mar 26, 2024
bc90225
container-compose: remove host port mapping for pop
charliemirabile Mar 26, 2024
6a46eda
nginx: connect directly to smtp container instead of host
charliemirabile Mar 26, 2024
ba2fe82
container-compose: remove host port mapping for smtp
charliemirabile Mar 26, 2024
bd187dd
container-compose: isolate backend servers from eachother
charliemirabile Mar 26, 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
39 changes: 18 additions & 21 deletions container-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ services:
app_protocol: pop3s
mode: host
name: "port for pop3s connections to proxy"
depends_on:
- orbit
- smtp
- pop
networks:
- orbit
- smtp
- pop
orbit:
build:
context: orbit
Expand All @@ -76,13 +84,8 @@ services:
target: /orbit/docs
read_only: true
selinux: z
ports:
- target: 9098
published: 9098
protocol: tcp
app_protocol: http
mode: host
name: "unencrypted http upstream server port"
networks:
- orbit
smtp:
build:
context: smtp
Expand All @@ -99,13 +102,8 @@ services:
target: /mnt/email_data
read_only: false
selinux: z
ports:
- target: 1465
published: 11465
protocol: tcp
app_protocol: smtp
mode: host
name: "unencrypted smtp upstream server port"
networks:
- smtp
pop:
build:
context: pop
Expand All @@ -121,10 +119,9 @@ services:
target: /mnt/mail
read_only: true
selinux: z
ports:
- target: 1995
published: 11995
protocol: tcp
app_protocol: pop3
mode: host
name: "unencrypted pop3 upstream server port"
networks:
- pop
networks:
orbit:
smtp:
pop:
39 changes: 18 additions & 21 deletions container-compose-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ services:
app_protocol: pop3s
mode: host
name: "port for pop3s connections to proxy"
depends_on:
- orbit
- smtp
- pop
networks:
- orbit
- smtp
- pop
orbit:
build:
context: orbit
Expand All @@ -66,13 +74,8 @@ services:
target: /orbit/docs
read_only: true
selinux: z
ports:
- target: 9098
published: 9098
protocol: tcp
app_protocol: http
mode: host
name: "unencrypted http upstream server port"
networks:
- orbit
smtp:
build:
context: smtp
Expand All @@ -89,13 +92,8 @@ services:
target: /mnt/email_data
read_only: false
selinux: z
ports:
- target: 1465
published: 11465
protocol: tcp
app_protocol: smtp
mode: host
name: "unencrypted smtp upstream server port"
networks:
- smtp
pop:
build:
context: pop
Expand All @@ -111,10 +109,9 @@ services:
target: /mnt/mail
read_only: true
selinux: z
ports:
- target: 1995
published: 11995
protocol: tcp
app_protocol: pop3
mode: host
name: "unencrypted pop3 upstream server port"
networks:
- pop
networks:
orbit:
smtp:
pop:
39 changes: 18 additions & 21 deletions container-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,14 @@ services:
app_protocol: pop3s
mode: host
name: "port for pop3s connections to proxy"
depends_on:
- orbit
- smtp
- pop
networks:
- orbit
- smtp
- pop
orbit:
build:
context: orbit
Expand All @@ -66,13 +74,8 @@ services:
target: /orbit/docs
read_only: true
selinux: z
ports:
- target: 9098
published: 9098
protocol: tcp
app_protocol: http
mode: host
name: "unencrypted http upstream server port"
networks:
- orbit
smtp:
build:
context: smtp
Expand All @@ -89,13 +92,8 @@ services:
target: /mnt/email_data
read_only: false
selinux: z
ports:
- target: 1465
published: 11465
protocol: tcp
app_protocol: smtp
mode: host
name: "unencrypted smtp upstream server port"
networks:
- smtp
pop:
build:
context: pop
Expand All @@ -111,10 +109,9 @@ services:
target: /mnt/mail
read_only: true
selinux: z
ports:
- target: 1995
published: 11995
protocol: tcp
app_protocol: pop3
mode: host
name: "unencrypted pop3 upstream server port"
networks:
- pop
networks:
orbit:
smtp:
pop:
2 changes: 1 addition & 1 deletion nginx_snippets/http/00-mail_auth.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ server {
listen 127.0.0.1:13337 default_server;
location /mail_auth {
include uwsgi_params;
proxy_pass http://host.containers.internal:9098;
proxy_pass http://orbit:9098;
}

location = /mail_auth/pop {
Expand Down
2 changes: 1 addition & 1 deletion nginx_snippets/server_https/01-orbit-paths.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ location @login {
location ~* ^((.*\.md)|/log(in|out)|/dashboard|/register|/cgit.*)$ {
include uwsgi_params;
proxy_intercept_errors on;
proxy_pass http://host.containers.internal:9098;
proxy_pass http://orbit:9098;
}
2 changes: 1 addition & 1 deletion nginx_snippets/stream/00-pop-proxy.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server {
listen 127.0.0.1:2995;
proxy_pass host.containers.internal:11995;
proxy_pass pop:1995;
}
2 changes: 1 addition & 1 deletion nginx_snippets/stream/01-smtp-proxy.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server {
listen 127.0.0.1:2465;
proxy_pass host.containers.internal:11465;
proxy_pass smtp:1465;
}