-
Notifications
You must be signed in to change notification settings - Fork 12
Mega cleanup #55
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.
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
Closed
Closed
Mega cleanup #55
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
77c191f
extenginx: create self signed certs automatically
charliemirabile f74ff54
container-compose: switch ssl mount from bind to volume
charliemirabile 13d0122
extenginx: remove unused create_dev_keys.sh
charliemirabile 8b6ea65
extenginx: remove specific runtime snippets option
charliemirabile ae5f3f4
extenginx: remove expose instructions
charliemirabile 01b346e
extenginx: split envsubst multiline to ease reading/editing
charliemirabile 76e02bb
extenginx: remove support for http connections
charliemirabile a92779e
extenginx: switch from ports to full listen specifications
charliemirabile 4911078
container-compose: switch to unix sockets for nginx
charliemirabile a671b77
tests: switch to connecting directly to unix sockets
charliemirabile 2a245da
introduce webroot to build process of extenginx
charliemirabile a308b3d
nginx: re-number server_https snippets
charliemirabile 0803d4e
container-compose: switch email to named volume
charliemirabile 6dd56ef
orbit: add docs and git dir as build contexts
charliemirabile 355f27e
orbit: save database in volume for persistance
charliemirabile 7b9e67a
use .env for hostname and version info
charliemirabile fd0ab24
remove container-compose-staging.yml
charliemirabile ae000da
container-compose-dev.yml: use include to remove duplicate stuff
charliemirabile 9b645e3
introduce compose.yml that includes the appropriate base yml based on…
charliemirabile 538c261
rename compose files to better represent purpose
charliemirabile 097b134
rename to remove container prefix
charliemirabile 3cb62f0
compose/Containerfiles: make all additional contexts lowercase
charliemirabile c5462e6
docker compose fixes
charliemirabile f5e4e69
fix dev build for docker-compose
charliemirabile 326fb2c
test: adapt script to the mega cleanup
theyoyojo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| env.dev |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| _SINGULARITY_ACTIVATE_CONTAINER_BACKEND=${CONTAINER_BACKEND:-podman} | ||
|
|
||
| [ "$(command -v deactivate)" = "deactivate" ] && [ -z "${SINGULARITY_ACTIVATE_OVERWRITE_DEACTIVATE+x}" ] && { | ||
| echo 'refusing to overwrite deactivate function. set SINGULARITY_ACTIVATE_OVERWRITE_DEACTIVATE to override' >&2 | ||
| return 1 | ||
| } | ||
|
|
||
| deactivate () { | ||
| unset -v PS1 | ||
| if [ -n "${_SINGULARITY_ACTIVATE_OLD_PS1_VALUE+x}" ] | ||
| then | ||
| PS1="${_SINGULARITY_ACTIVATE_OLD_PS1_VALUE}" | ||
| unset -v _SINGULARITY_ACTIVATE_OLD_PS1_VALUE | ||
| if [ -n "${_SINGULARITY_ACTIVATE_PS1_WAS_EXPORTED+x}" ] | ||
| then | ||
| export PS1 | ||
| unset -v _SINGULARITY_ACTIVATE_PS1_WAS_EXPORTED | ||
| fi | ||
| fi | ||
|
|
||
| unset -v DOCKER_HOST | ||
| if [ -n "${_SINGULARITY_ACTIVATE_OLD_DOCKER_HOST_VALUE+x}" ] | ||
| then | ||
| DOCKER_HOST="${_SINGULARITY_ACTIVATE_OLD_DOCKER_HOST_VALUE}" | ||
| unset -v _SINGULARITY_ACTIVATE_OLD_DOCKER_HOST_VALUE | ||
| if [ -n "${_SINGULARITY_ACTIVATE_DOCKER_HOST_WAS_EXPORTED+x}" ] | ||
| then | ||
| export DOCKER_HOST | ||
| unset -v _SINGULARITY_ACTIVATE_DOCKER_HOST_WAS_EXPORTED | ||
| fi | ||
| fi | ||
|
|
||
| if [ -n "${_SINGULARITY_ACTIVATE_CONTAINER_SOCKET_WAS_ACTIVE+x}" ] | ||
| then | ||
| unset -v _SINGULARITY_ACTIVATE_CONTAINER_SOCKET_WAS_ACTIVE | ||
| else | ||
| systemctl stop --user ${_SINGULARITY_ACTIVATE_CONTAINER_BACKEND}.socket | ||
| fi | ||
|
|
||
| unset -f deactivate | ||
| } | ||
|
|
||
| if systemctl --user is-active ${_SINGULARITY_ACTIVATE_CONTAINER_BACKEND}.socket --quiet | ||
| then | ||
| _SINGULARITY_ACTIVATE_CONTAINER_SOCKET_WAS_ACTIVE=1 | ||
| else | ||
| systemctl --user start ${_SINGULARITY_ACTIVATE_CONTAINER_BACKEND}.socket | ||
| fi | ||
|
|
||
| if [ -n "${DOCKER_HOST+x}" ] | ||
| then | ||
| _SINGULARITY_ACTIVATE_OLD_DOCKER_HOST_VALUE="${DOCKER_HOST}" | ||
| if env | grep -q '^DOCKER_HOST=' | ||
| then | ||
| _SINGULARITY_ACTIVATE_DOCKER_HOST_WAS_EXPORTED=1 | ||
| fi | ||
| fi | ||
| export DOCKER_HOST="unix://${XDG_RUNTIME_DIR}/${_SINGULARITY_ACTIVATE_CONTAINER_BACKEND}/${_SINGULARITY_ACTIVATE_CONTAINER_BACKEND}.sock" | ||
|
|
||
| if [ -n "${PS1+x}" ] | ||
| then | ||
| _SINGULARITY_ACTIVATE_OLD_PS1_VALUE="${PS1}" | ||
| if env | grep '^PS1=' | ||
| then | ||
| _SINGULARITY_ACTIVATE_PS1_WAS_EXPORTED=1 | ||
| fi | ||
| fi | ||
| PS1="(singularity) ${PS1}" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| services: | ||
| nginx: | ||
| build: | ||
| context: extenginx | ||
| additional_contexts: | ||
| - nginx_snippet_source=./nginx_snippets | ||
| - nginx_webroot_content=./kdlp.underground.software | ||
| dockerfile: Containerfile | ||
| target: nginx | ||
| args: | ||
| NGINX_HOSTNAME: ${SINGULARITY_HOSTNAME} | ||
| NGINX_HTTPS_LISTEN: 'unix:/run/nginx/socks/https.sock' | ||
| NGINX_SMTPS_LISTEN: 'unix:/run/nginx/socks/smtps.sock' | ||
| NGINX_POP3S_LISTEN: 'unix:/run/nginx/socks/pop3s.sock' | ||
| volumes: | ||
| - type: bind | ||
| source: ./socks | ||
| target: /run/nginx/socks | ||
| - type: volume | ||
| source: ssl-certs | ||
| target: /etc/ssl/nginx | ||
| read_only: true | ||
| depends_on: | ||
| - orbit | ||
| - smtp | ||
| - pop | ||
| networks: | ||
| - orbit | ||
| - smtp | ||
| - pop | ||
| orbit: | ||
| build: | ||
| context: orbit | ||
| dockerfile: Containerfile | ||
| additional_contexts: | ||
| - orbit_singularity_git_dir=./gitdir | ||
| - orbit_docs_source=./kdlp.underground.software | ||
| target: orbit | ||
| args: | ||
| orbit_version_info: "singularity ${SINGULARITY_VERSION_INFO} https://github.com/underground-software/singularity" | ||
| volumes: | ||
| - type: volume | ||
| source: orbit-db | ||
| target: /var/orbit | ||
| read_only: false | ||
| networks: | ||
| - orbit | ||
| smtp: | ||
| build: | ||
| context: smtp | ||
| dockerfile: Containerfile | ||
| additional_contexts: | ||
| - tcp_server_source=./tcp_server | ||
| target: smtp | ||
| args: | ||
| hostname: ${SINGULARITY_HOSTNAME} | ||
| LISTEN_PORT: 1465 | ||
| volumes: | ||
| - type: volume | ||
| source: email | ||
| target: /mnt/email_data | ||
| read_only: false | ||
| networks: | ||
| - smtp | ||
| pop: | ||
| build: | ||
| context: pop | ||
| dockerfile: Containerfile | ||
| additional_contexts: | ||
| - tcp_server_source=./tcp_server | ||
| target: pop | ||
| args: | ||
| LISTEN_PORT: 1995 | ||
| volumes: | ||
| - type: volume | ||
| source: email | ||
| target: /mnt/email_data | ||
| read_only: true | ||
| depends_on: | ||
| - smtp | ||
| networks: | ||
| - pop | ||
| networks: | ||
| orbit: | ||
| name: orbit | ||
| smtp: | ||
| name: smtp | ||
| pop: | ||
| name: pop | ||
| volumes: | ||
| ssl-certs: | ||
| email: | ||
| orbit-db: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| include: | ||
| - ${SINGULARITY_INCLUDE_PATH} | ||
| services: | ||
| nginx: | ||
| security_opt: | ||
| - label:disable | ||
| volumes: | ||
| - type: bind | ||
| source: ./nginx_snippets | ||
| target: /etc/nginx/include.d | ||
| read_only: true | ||
| - type: bind | ||
| source: ./kdlp.underground.software | ||
| target: /var/www/html | ||
| read_only: true | ||
| orbit: | ||
| security_opt: | ||
| - label:disable | ||
| volumes: | ||
| - type: bind | ||
| source: ./kdlp.underground.software | ||
| target: /orbit/docs | ||
| read_only: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| include: | ||
| - "${SINGULARITY_COMPOSE_BASE}" | ||
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no f
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sfingularity? What f
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
h