Skip to content

Cleanup compose files #28

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 4 commits into from
Mar 18, 2024
Merged

Cleanup compose files #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da9a975
Refactor mount specifications to use the more verbose but clearer syntax
charliemirabile Mar 16, 2024
2a98d1a
Refactor port specification to use the more verbose but clearer syntax
charliemirabile Mar 16, 2024
a20c8ce
add name and app_protocol label to port specifications
charliemirabile Mar 16, 2024
e60656c
container-compose-dev.yml: specify hostname for parity with other com…
charliemirabile Mar 16, 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
92 changes: 78 additions & 14 deletions container-compose-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ services:
dockerfile: Containerfile
target: nginx
args:
NGINX_HOSTNAME: localhost
NGINX_HTTP_PORT: 1080
NGINX_HTTPS_PORT: 1443
NGINX_SMTPS_PORT: 1465
Expand All @@ -15,14 +16,46 @@ services:
security_opt:
- label:disable
volumes:
- ./ssl:/etc/ssl/nginx:ro,z
- ./nginx_snippets:/etc/nginx/include.d:ro,z
- ./kdlp.underground.software:/var/www/html:ro,z
- type: bind
source: ./ssl
target: /etc/ssl/nginx
read_only: true
selinux: z
- type: bind
Comment thread
charliemirabile marked this conversation as resolved.
source: ./nginx_snippets
target: /etc/nginx/include.d
read_only: true
selinux: z
- type: bind
source: ./kdlp.underground.software
target: /var/www/html
read_only: true
selinux: z
ports:
- 1080:1080
- 1443:1443
- 1465:1465
- 1995:1995
- target: 1080
published: 1080
Comment thread
charliemirabile marked this conversation as resolved.
protocol: tcp
app_protocol: http
mode: host
name: "port for http connections to proxy"
Comment thread
charliemirabile marked this conversation as resolved.
- target: 1443
published: 1443
protocol: tcp
app_protocol: https
mode: host
name: "port for https connections to proxy"
- target: 1465
published: 1465
protocol: tcp
app_protocol: smtps
mode: host
name: "port for smtps connections to proxy"
- target: 1995
published: 1995
protocol: tcp
app_protocol: pop3s
mode: host
name: "port for pop3s connections to proxy"
orbit:
build:
context: orbit
Expand All @@ -31,10 +64,23 @@ services:
security_opt:
- label:disable
volumes:
- ./.git:/var/git/singularity:ro,z
- ./kdlp.underground.software:/orbit/docs:ro,z
- type: bind
source: ./.git
target: /var/git/singularity
read_only: true
selinux: z
- type: bind
source: ./kdlp.underground.software
target: /orbit/docs
read_only: true
selinux: z
ports:
- 9098:9098
- target: 9098
published: 9098
protocol: tcp
app_protocol: http
mode: host
name: "unencrypted http upstream server port"
smtp:
build:
context: smtp
Expand All @@ -45,9 +91,18 @@ services:
args:
hostname: localhost
volumes:
- ./email:/mnt/email_data:z
- type: bind
source: ./email
target: /mnt/email_data
read_only: false
selinux: z
ports:
- 11465:465
- target: 465
published: 11465
protocol: tcp
app_protocol: smtp
mode: host
name: "unencrypted smtp upstream server port"
pop:
build:
context: pop
Expand All @@ -56,6 +111,15 @@ services:
- TCP_SERVER_SOURCE=./tcp_server
target: pop
volumes:
- ./email/mail:/mnt/mail:ro,z
- type: bind
source: ./email/mail
target: /mnt/mail
read_only: true
selinux: z
ports:
- 11995:995
- target: 995
published: 11995
protocol: tcp
app_protocol: pop3
mode: host
name: "unencrypted pop3 upstream server port"
85 changes: 72 additions & 13 deletions container-compose-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,64 @@ services:
args:
NGINX_HOSTNAME: dev.underground.software
volumes:
- ./ssl:/etc/ssl/nginx:ro,z
- ./kdlp.underground.software:/var/www/html:ro,z
- type: bind
source: ./ssl
target: /etc/ssl/nginx
read_only: true
selinux: z
- type: bind
source: ./kdlp.underground.software
target: /var/www/html
read_only: true
selinux: z
ports:
- 80:80
- 443:443
- 465:465
- 995:995
- target: 80
published: 80
protocol: tcp
app_protocol: http
mode: host
name: "port for http connections to proxy"
- target: 443
published: 443
protocol: tcp
app_protocol: https
mode: host
name: "port for https connections to proxy"
- target: 465
published: 465
protocol: tcp
app_protocol: smtps
mode: host
name: "port for smtps connections to proxy"
- target: 995
published: 995
protocol: tcp
app_protocol: pop3s
mode: host
name: "port for pop3s connections to proxy"
orbit:
build:
context: orbit
dockerfile: Containerfile
target: orbit
volumes:
- ./.git:/var/git/singularity:ro,z
- ./kdlp.underground.software:/orbit/docs:ro,z
- type: bind
source: ./.git
target: /var/git/singularity
read_only: true
selinux: z
- type: bind
source: ./kdlp.underground.software
target: /orbit/docs
read_only: true
selinux: z
ports:
- 9098:9098
- target: 9098
published: 9098
protocol: tcp
app_protocol: http
mode: host
name: "unencrypted http upstream server port"
smtp:
build:
context: smtp
Expand All @@ -36,9 +77,18 @@ services:
args:
hostname: dev.underground.software
volumes:
- ./email:/mnt/email_data:z
- type: bind
source: ./email
target: /mnt/email_data
read_only: false
selinux: z
ports:
- 11465:465
- target: 465
published: 11465
protocol: tcp
app_protocol: smtp
mode: host
name: "unencrypted smtp upstream server port"
pop:
build:
context: pop
Expand All @@ -47,6 +97,15 @@ services:
- TCP_SERVER_SOURCE=./tcp_server
target: pop
volumes:
- ./email/mail:/mnt/mail:ro,z
- type: bind
source: ./email/mail
target: /mnt/mail
read_only: true
selinux: z
ports:
- 11995:995
- target: 995
published: 11995
protocol: tcp
app_protocol: pop3
mode: host
name: "unencrypted pop3 upstream server port"
85 changes: 72 additions & 13 deletions container-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,64 @@ services:
args:
NGINX_HOSTNAME: kdlp.underground.software
volumes:
- ./ssl:/etc/ssl/nginx:ro,z
- ./kdlp.underground.software:/var/www/html:ro,z
- type: bind
source: ./ssl
target: /etc/ssl/nginx
read_only: true
selinux: z
- type: bind
source: ./kdlp.underground.software
target: /var/www/html
read_only: true
selinux: z
ports:
- 80:80
- 443:443
- 465:465
- 995:995
- target: 80
published: 80
protocol: tcp
app_protocol: http
mode: host
name: "port for http connections to proxy"
- target: 443
published: 443
protocol: tcp
app_protocol: https
mode: host
name: "port for https connections to proxy"
- target: 465
published: 465
protocol: tcp
app_protocol: smtps
mode: host
name: "port for smtps connections to proxy"
- target: 995
published: 995
protocol: tcp
app_protocol: pop3s
mode: host
name: "port for pop3s connections to proxy"
orbit:
build:
context: orbit
dockerfile: Containerfile
target: orbit
volumes:
- ./.git:/var/git/singularity:ro,z
- ./kdlp.underground.software:/orbit/docs:ro,z
- type: bind
source: ./.git
target: /var/git/singularity
read_only: true
selinux: z
- type: bind
source: ./kdlp.underground.software
target: /orbit/docs
read_only: true
selinux: z
ports:
- 9098:9098
- target: 9098
published: 9098
protocol: tcp
app_protocol: http
mode: host
name: "unencrypted http upstream server port"
smtp:
build:
context: smtp
Expand All @@ -36,9 +77,18 @@ services:
args:
hostname: kdlp.underground.software
volumes:
- ./email:/mnt/email_data:z
- type: bind
source: ./email
target: /mnt/email_data
read_only: false
selinux: z
ports:
- 11465:465
- target: 465
published: 11465
protocol: tcp
app_protocol: smtp
mode: host
name: "unencrypted smtp upstream server port"
pop:
build:
context: pop
Expand All @@ -47,6 +97,15 @@ services:
- TCP_SERVER_SOURCE=./tcp_server
target: pop
volumes:
- ./email/mail:/mnt/mail:ro,z
- type: bind
source: ./email/mail
target: /mnt/mail
read_only: true
selinux: z
ports:
- 11995:995
- target: 995
published: 11995
protocol: tcp
app_protocol: pop3
mode: host
name: "unencrypted pop3 upstream server port"