From 4f5c99acec2ee1be27f521795a1e08d1d1f478cf Mon Sep 17 00:00:00 2001 From: SG <13872653+mmguero@users.noreply.github.com> Date: Mon, 13 Sep 2021 14:31:33 -0600 Subject: [PATCH] reorganize repository to a flatter layout --- .../calibre-web-build-push-arm32v7-ghcr.yml | 6 +++--- .github/workflows/calibre-web-build-push-ghcr.yml | 6 +++--- .github/workflows/capa-build-push-ghcr.yml | 4 ++-- .github/workflows/mattermost-build-push-ghcr.yml | 10 +++++----- .github/workflows/minikeyvalue-build-push-ghcr.yml | 4 ++-- .../nextcloud-build-push-arm32v7-ghcr.yml | 6 +++--- .github/workflows/nextcloud-build-push-ghcr.yml | 6 +++--- .../workflows/nginx-securimage-build-push-ghcr.yml | 6 +++--- .github/workflows/signal-build-push-ghcr.yml | 4 ++-- .github/workflows/stunnel-build-push-ghcr.yml | 4 ++-- .github/workflows/teams-build-push-ghcr.yml | 4 ++-- .github/workflows/tunneler-build-push-ghcr.yml | 4 ++-- .github/workflows/xfce-build-push-ghcr.yml | 14 +++++++------- .gitmodules | 6 +++--- {services/bitwarden => bitwarden}/.env | 0 {services/bitwarden => bitwarden}/data/.gitignore | 0 .../bitwarden => bitwarden}/docker-compose.yml | 0 {services/booksonic => booksonic}/.dockerignore | 0 .../config => booksonic/audiobooks}/.gitignore | 0 .../config/data => booksonic/config}/.gitignore | 0 .../booksonic => booksonic}/docker-compose.yml | 0 {services/booksonic => booksonic}/ldap_notes.txt | 0 {services/booksonic => booksonic}/ldap_setup.sh | 0 .../logs => booksonic/othermedia}/.gitignore | 0 .../config/run => booksonic/podcasts}/.gitignore | 0 {services/booksonic => booksonic}/proxy/nginx.conf | 0 .../calibre-web => calibre-web}/.dockerignore | 0 .../calibre-web => calibre-web}/docker-compose.yml | 0 .../calibre-web => calibre-web}/docker/Dockerfile | 2 +- .../docker/Dockerfile.arm32v7 | 2 +- {infosec/capa => capa}/.gitignore | 0 {infosec/capa => capa}/Dockerfile | 2 +- {infosec/capa => capa}/README.md | 0 {infosec/capa => capa}/capa-docker.sh | 0 .../certs}/.gitignore | 0 .../docker-registry => docker-registry}/run.sh | 0 services/espejo => espejo | 0 {services/gogs => gogs}/docker-compose.yml | 0 {services/mattermost => mattermost}/.dockerignore | 0 {services/mattermost => mattermost}/.env.template | 0 {services/mattermost => mattermost}/.gitignore | 0 .../mattermost => mattermost}/config.json.template | 0 .../config => mattermost/data}/.gitignore | 0 .../mattermost => mattermost}/docker-compose.yml | 0 .../docker/mattermost.Dockerfile | 2 +- .../docker/postgres.Dockerfile | 0 {db/minikeyvalue => minikeyvalue}/Dockerfile | 2 +- {db/minikeyvalue => minikeyvalue}/supervisord.conf | 0 {services/nextcloud => nextcloud}/.dockerignore | 0 .../othermedia => nextcloud/data}/.gitignore | 0 .../booksonic/podcasts => nextcloud/db}/.gitignore | 0 .../nextcloud => nextcloud}/docker-compose.yml | 0 .../nextcloud => nextcloud}/docker/Dockerfile | 2 +- .../docker/Dockerfile.arm32v7 | 2 +- net/nginx-ldap => nginx-ldap | 0 .../config/proxy_overrides.conf | 0 .../nginx-proxy => nginx-proxy}/docker-compose.yml | 0 .../docker-compose.yml | 0 .../docker/nginx.Dockerfile | 2 +- .../nginx/server.conf | 0 .../php/php-fpm-settings.conf | 0 .../php/php.ini | 0 .../webcontent/index.php | 0 {services/openldap => openldap}/docker-compose.yml | 0 {services/pihole => pihole}/docker-compose.yml | 0 .../pihole => pihole}/etc-dnsmasq.d/.gitignore | 0 .../etc-dnsmasq.d/03-custom-dns.conf | 0 {services/pihole => pihole}/etc-pihole/.gitignore | 0 {services/pihole => pihole}/etc-pihole/custom.list | 0 {services/pihole => pihole}/var-log/.gitignore | 0 {services/screego => screego}/docker-compose.yml | 0 {comm/signal => signal}/Dockerfile | 2 +- .../docker-registry => smtp4dev}/certs/.gitignore | 0 {services/smtp4dev => smtp4dev}/docker-compose.yml | 0 {db/splunk => splunk}/docker-compose.yml | 0 {services/step-ca => step-ca}/.dockerignore | 0 {services/step-ca => step-ca}/.gitignore | 0 {services/step-ca => step-ca}/README.md | 0 {services/step-ca => step-ca}/docker-compose.yml | 0 .../mattermost/data => step-ca/step}/.gitignore | 0 .../data => step-ca/step/certs}/.gitignore | 0 .../db => step-ca/step/config}/.gitignore | 0 .../smtp4dev/certs => step-ca/step/db}/.gitignore | 0 .../step => step-ca/step/secrets}/.gitignore | 0 .../certs => step-ca/step/templates}/.gitignore | 0 {net/stunnel => stunnel}/Dockerfile | 2 +- {comm/teams => teams}/Dockerfile | 2 +- .../step/config => traefix-proxy/certs}/.gitignore | 0 .../docker-compose.yml | 0 .../db => traefix-proxy/letsencrypt}/.gitignore | 0 {services/tunneler => tunneler}/Dockerfile | 2 +- .../tunneler => tunneler}/croc_relay_entrypoint.sh | 0 {services/tunneler => tunneler}/docker-compose.yml | 0 {services/tunneler => tunneler}/supervisord.conf | 0 {net/unifi => unifi}/Dockerfile | 0 .../step/secrets => unifi/config}/.gitignore | 0 .../templates => unifi/config/data}/.gitignore | 0 .../certs => unifi/config/logs}/.gitignore | 0 .../letsencrypt => unifi/config/run}/.gitignore | 0 {net/unifi => unifi}/docker-compose.yml | 0 {net/unifi => unifi}/entrypoint.sh | 0 {services/vault => vault}/.dockerignore | 0 {services/vault => vault}/Dockerfile | 2 +- {services/vault => vault}/config/vault-config.json | 0 {services/vault => vault}/docker-compose.yml | 0 {desktop/xfce => xfce}/Dockerfile | 2 +- {desktop/xfce => xfce}/xfce-base.Dockerfile | 0 {desktop/xfce => xfce}/xfce-ext.Dockerfile | 3 ++- infosec/zeek => zeek | 0 109 files changed, 58 insertions(+), 57 deletions(-) rename {services/bitwarden => bitwarden}/.env (100%) rename {services/bitwarden => bitwarden}/data/.gitignore (100%) rename {services/bitwarden => bitwarden}/docker-compose.yml (100%) rename {services/booksonic => booksonic}/.dockerignore (100%) rename {net/unifi/config => booksonic/audiobooks}/.gitignore (100%) rename {net/unifi/config/data => booksonic/config}/.gitignore (100%) rename {services/booksonic => booksonic}/docker-compose.yml (100%) rename {services/booksonic => booksonic}/ldap_notes.txt (100%) rename {services/booksonic => booksonic}/ldap_setup.sh (100%) rename {net/unifi/config/logs => booksonic/othermedia}/.gitignore (100%) rename {net/unifi/config/run => booksonic/podcasts}/.gitignore (100%) rename {services/booksonic => booksonic}/proxy/nginx.conf (100%) rename {services/calibre-web => calibre-web}/.dockerignore (100%) rename {services/calibre-web => calibre-web}/docker-compose.yml (100%) rename {services/calibre-web => calibre-web}/docker/Dockerfile (96%) rename {services/calibre-web => calibre-web}/docker/Dockerfile.arm32v7 (98%) rename {infosec/capa => capa}/.gitignore (100%) rename {infosec/capa => capa}/Dockerfile (98%) rename {infosec/capa => capa}/README.md (100%) rename {infosec/capa => capa}/capa-docker.sh (100%) rename {services/booksonic/audiobooks => docker-registry/certs}/.gitignore (100%) rename {services/docker-registry => docker-registry}/run.sh (100%) rename services/espejo => espejo (100%) rename {services/gogs => gogs}/docker-compose.yml (100%) rename {services/mattermost => mattermost}/.dockerignore (100%) rename {services/mattermost => mattermost}/.env.template (100%) rename {services/mattermost => mattermost}/.gitignore (100%) rename {services/mattermost => mattermost}/config.json.template (100%) rename {services/booksonic/config => mattermost/data}/.gitignore (100%) rename {services/mattermost => mattermost}/docker-compose.yml (100%) rename {services/mattermost => mattermost}/docker/mattermost.Dockerfile (98%) rename {services/mattermost => mattermost}/docker/postgres.Dockerfile (100%) rename {db/minikeyvalue => minikeyvalue}/Dockerfile (98%) rename {db/minikeyvalue => minikeyvalue}/supervisord.conf (100%) rename {services/nextcloud => nextcloud}/.dockerignore (100%) rename {services/booksonic/othermedia => nextcloud/data}/.gitignore (100%) rename {services/booksonic/podcasts => nextcloud/db}/.gitignore (100%) rename {services/nextcloud => nextcloud}/docker-compose.yml (100%) rename {services/nextcloud => nextcloud}/docker/Dockerfile (93%) rename {services/nextcloud => nextcloud}/docker/Dockerfile.arm32v7 (93%) rename net/nginx-ldap => nginx-ldap (100%) rename {services/nginx-proxy => nginx-proxy}/config/proxy_overrides.conf (100%) rename {services/nginx-proxy => nginx-proxy}/docker-compose.yml (100%) rename {net/nginx-securimage => nginx-securimage}/docker-compose.yml (100%) rename {net/nginx-securimage => nginx-securimage}/docker/nginx.Dockerfile (95%) rename {net/nginx-securimage => nginx-securimage}/nginx/server.conf (100%) rename {net/nginx-securimage => nginx-securimage}/php/php-fpm-settings.conf (100%) rename {net/nginx-securimage => nginx-securimage}/php/php.ini (100%) rename {net/nginx-securimage => nginx-securimage}/webcontent/index.php (100%) rename {services/openldap => openldap}/docker-compose.yml (100%) rename {services/pihole => pihole}/docker-compose.yml (100%) rename {services/pihole => pihole}/etc-dnsmasq.d/.gitignore (100%) rename {services/pihole => pihole}/etc-dnsmasq.d/03-custom-dns.conf (100%) rename {services/pihole => pihole}/etc-pihole/.gitignore (100%) rename {services/pihole => pihole}/etc-pihole/custom.list (100%) rename {services/pihole => pihole}/var-log/.gitignore (100%) rename {services/screego => screego}/docker-compose.yml (100%) rename {comm/signal => signal}/Dockerfile (98%) rename {services/docker-registry => smtp4dev}/certs/.gitignore (100%) rename {services/smtp4dev => smtp4dev}/docker-compose.yml (100%) rename {db/splunk => splunk}/docker-compose.yml (100%) rename {services/step-ca => step-ca}/.dockerignore (100%) rename {services/step-ca => step-ca}/.gitignore (100%) rename {services/step-ca => step-ca}/README.md (100%) rename {services/step-ca => step-ca}/docker-compose.yml (100%) rename {services/mattermost/data => step-ca/step}/.gitignore (100%) rename {services/nextcloud/data => step-ca/step/certs}/.gitignore (100%) rename {services/nextcloud/db => step-ca/step/config}/.gitignore (100%) rename {services/smtp4dev/certs => step-ca/step/db}/.gitignore (100%) rename {services/step-ca/step => step-ca/step/secrets}/.gitignore (100%) rename {services/step-ca/step/certs => step-ca/step/templates}/.gitignore (100%) rename {net/stunnel => stunnel}/Dockerfile (93%) rename {comm/teams => teams}/Dockerfile (98%) rename {services/step-ca/step/config => traefix-proxy/certs}/.gitignore (100%) rename {services/traefix-proxy => traefix-proxy}/docker-compose.yml (100%) rename {services/step-ca/step/db => traefix-proxy/letsencrypt}/.gitignore (100%) rename {services/tunneler => tunneler}/Dockerfile (99%) rename {services/tunneler => tunneler}/croc_relay_entrypoint.sh (100%) rename {services/tunneler => tunneler}/docker-compose.yml (100%) rename {services/tunneler => tunneler}/supervisord.conf (100%) rename {net/unifi => unifi}/Dockerfile (100%) rename {services/step-ca/step/secrets => unifi/config}/.gitignore (100%) rename {services/step-ca/step/templates => unifi/config/data}/.gitignore (100%) rename {services/traefix-proxy/certs => unifi/config/logs}/.gitignore (100%) rename {services/traefix-proxy/letsencrypt => unifi/config/run}/.gitignore (100%) rename {net/unifi => unifi}/docker-compose.yml (100%) rename {net/unifi => unifi}/entrypoint.sh (100%) rename {services/vault => vault}/.dockerignore (100%) rename {services/vault => vault}/Dockerfile (97%) rename {services/vault => vault}/config/vault-config.json (100%) rename {services/vault => vault}/docker-compose.yml (100%) rename {desktop/xfce => xfce}/Dockerfile (99%) rename {desktop/xfce => xfce}/xfce-base.Dockerfile (100%) rename {desktop/xfce => xfce}/xfce-ext.Dockerfile (98%) rename infosec/zeek => zeek (100%) diff --git a/.github/workflows/calibre-web-build-push-arm32v7-ghcr.yml b/.github/workflows/calibre-web-build-push-arm32v7-ghcr.yml index 46bf5e1..92600f0 100644 --- a/.github/workflows/calibre-web-build-push-arm32v7-ghcr.yml +++ b/.github/workflows/calibre-web-build-push-arm32v7-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'services/calibre-web/**' + - 'calibre-web/**' workflow_dispatch: jobs: @@ -35,8 +35,8 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./services/calibre-web - file: ./services/calibre-web/docker/Dockerfile.arm32v7 + context: ./calibre-web + file: ./calibre-web/docker/Dockerfile.arm32v7 platforms: linux/arm/v7 push: true tags: ghcr.io/${{ github.repository_owner }}/calibre-web:arm32v7 diff --git a/.github/workflows/calibre-web-build-push-ghcr.yml b/.github/workflows/calibre-web-build-push-ghcr.yml index 257490e..f1779d4 100644 --- a/.github/workflows/calibre-web-build-push-ghcr.yml +++ b/.github/workflows/calibre-web-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'services/calibre-web/**' + - 'calibre-web/**' workflow_dispatch: jobs: @@ -35,7 +35,7 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./services/calibre-web - file: ./services/calibre-web/docker/Dockerfile + context: ./calibre-web + file: ./calibre-web/docker/Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/calibre-web:latest diff --git a/.github/workflows/capa-build-push-ghcr.yml b/.github/workflows/capa-build-push-ghcr.yml index 40bd508..13ee2be 100644 --- a/.github/workflows/capa-build-push-ghcr.yml +++ b/.github/workflows/capa-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'infosec/capa/**' + - 'capa/**' workflow_dispatch: jobs: @@ -35,6 +35,6 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./infosec/capa + context: ./capa push: true tags: ghcr.io/${{ github.repository_owner }}/capa:latest diff --git a/.github/workflows/mattermost-build-push-ghcr.yml b/.github/workflows/mattermost-build-push-ghcr.yml index 06151c4..efbf675 100644 --- a/.github/workflows/mattermost-build-push-ghcr.yml +++ b/.github/workflows/mattermost-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'services/mattermost/**' + - 'mattermost/**' workflow_dispatch: jobs: @@ -35,15 +35,15 @@ jobs: name: Build and push mattermost uses: docker/build-push-action@v2 with: - context: ./services/mattermost - file: ./services/mattermost/docker/mattermost.Dockerfile + context: ./mattermost + file: ./mattermost/docker/mattermost.Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/mattermost-server:latest - name: Build and push postgres uses: docker/build-push-action@v2 with: - context: ./services/mattermost - file: ./services/mattermost/docker/postgres.Dockerfile + context: ./mattermost + file: ./mattermost/docker/postgres.Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/postgres:13-alpine diff --git a/.github/workflows/minikeyvalue-build-push-ghcr.yml b/.github/workflows/minikeyvalue-build-push-ghcr.yml index 1f02d09..0f0ba3a 100644 --- a/.github/workflows/minikeyvalue-build-push-ghcr.yml +++ b/.github/workflows/minikeyvalue-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'db/minikeyvalue/**' + - 'minikeyvalue/**' workflow_dispatch: jobs: @@ -35,6 +35,6 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./db/minikeyvalue + context: ./minikeyvalue push: true tags: ghcr.io/${{ github.repository_owner }}/minikeyvalue:latest diff --git a/.github/workflows/nextcloud-build-push-arm32v7-ghcr.yml b/.github/workflows/nextcloud-build-push-arm32v7-ghcr.yml index 7b7a6c9..1a4e28e 100644 --- a/.github/workflows/nextcloud-build-push-arm32v7-ghcr.yml +++ b/.github/workflows/nextcloud-build-push-arm32v7-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'services/nextcloud/**' + - 'nextcloud/**' workflow_dispatch: jobs: @@ -35,8 +35,8 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./services/nextcloud - file: ./services/nextcloud/docker/Dockerfile.arm32v7 + context: ./nextcloud + file: ./nextcloud/docker/Dockerfile.arm32v7 platforms: linux/arm/v7 push: true tags: ghcr.io/${{ github.repository_owner }}/nextcloud:arm32v7 diff --git a/.github/workflows/nextcloud-build-push-ghcr.yml b/.github/workflows/nextcloud-build-push-ghcr.yml index d0abd3a..3883a06 100644 --- a/.github/workflows/nextcloud-build-push-ghcr.yml +++ b/.github/workflows/nextcloud-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'services/nextcloud/**' + - 'nextcloud/**' workflow_dispatch: jobs: @@ -35,7 +35,7 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./services/nextcloud - file: ./services/nextcloud/docker/Dockerfile + context: ./nextcloud + file: ./nextcloud/docker/Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/nextcloud:latest diff --git a/.github/workflows/nginx-securimage-build-push-ghcr.yml b/.github/workflows/nginx-securimage-build-push-ghcr.yml index 11e8f2b..859b9ec 100644 --- a/.github/workflows/nginx-securimage-build-push-ghcr.yml +++ b/.github/workflows/nginx-securimage-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'net/nginx-securimage/**' + - 'nginx-securimage/**' workflow_dispatch: jobs: @@ -35,7 +35,7 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./net/nginx-securimage - file: ./net/nginx-securimage/docker/nginx.Dockerfile + context: ./nginx-securimage + file: ./nginx-securimage/docker/nginx.Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/nginx-securimage:latest diff --git a/.github/workflows/signal-build-push-ghcr.yml b/.github/workflows/signal-build-push-ghcr.yml index e23f071..4fa8d61 100644 --- a/.github/workflows/signal-build-push-ghcr.yml +++ b/.github/workflows/signal-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'comm/signal/**' + - 'signal/**' workflow_dispatch: jobs: @@ -35,6 +35,6 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./comm/signal + context: ./signal push: true tags: ghcr.io/${{ github.repository_owner }}/signal:latest diff --git a/.github/workflows/stunnel-build-push-ghcr.yml b/.github/workflows/stunnel-build-push-ghcr.yml index 904db19..e15d315 100644 --- a/.github/workflows/stunnel-build-push-ghcr.yml +++ b/.github/workflows/stunnel-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'net/stunnel/**' + - 'stunnel/**' workflow_dispatch: jobs: @@ -35,6 +35,6 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./net/stunnel + context: ./stunnel push: true tags: ghcr.io/${{ github.repository_owner }}/stunnel:latest diff --git a/.github/workflows/teams-build-push-ghcr.yml b/.github/workflows/teams-build-push-ghcr.yml index 5f6e767..d3d6672 100644 --- a/.github/workflows/teams-build-push-ghcr.yml +++ b/.github/workflows/teams-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'comm/teams/**' + - 'teams/**' workflow_dispatch: jobs: @@ -35,6 +35,6 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./comm/teams + context: ./teams push: true tags: ghcr.io/${{ github.repository_owner }}/teams:latest diff --git a/.github/workflows/tunneler-build-push-ghcr.yml b/.github/workflows/tunneler-build-push-ghcr.yml index e0ed4cd..2bf2361 100644 --- a/.github/workflows/tunneler-build-push-ghcr.yml +++ b/.github/workflows/tunneler-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'services/tunneler/**' + - 'tunneler/**' workflow_dispatch: jobs: @@ -35,6 +35,6 @@ jobs: name: Build and push uses: docker/build-push-action@v2 with: - context: ./services/tunneler + context: ./tunneler push: true tags: ghcr.io/${{ github.repository_owner }}/tunneler:latest diff --git a/.github/workflows/xfce-build-push-ghcr.yml b/.github/workflows/xfce-build-push-ghcr.yml index 20b352b..86b0ed2 100644 --- a/.github/workflows/xfce-build-push-ghcr.yml +++ b/.github/workflows/xfce-build-push-ghcr.yml @@ -5,7 +5,7 @@ on: branches: - 'master' paths: - - 'desktop/xfce/**' + - 'xfce/**' workflow_dispatch: jobs: @@ -35,8 +35,8 @@ jobs: name: Build and push base image uses: docker/build-push-action@v2 with: - context: ./desktop/xfce - file: ./desktop/xfce/xfce-base.Dockerfile + context: ./xfce + file: ./xfce/xfce-base.Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/xfce-base:latest - @@ -47,8 +47,8 @@ jobs: name: Build and push plus image uses: docker/build-push-action@v2 with: - context: ./desktop/xfce - file: ./desktop/xfce/Dockerfile + context: ./xfce + file: ./xfce/Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/xfce:latest - @@ -59,7 +59,7 @@ jobs: name: Build and push ext image uses: docker/build-push-action@v2 with: - context: ./desktop/xfce - file: ./desktop/xfce/xfce-ext.Dockerfile + context: ./xfce + file: ./xfce/xfce-ext.Dockerfile push: true tags: ghcr.io/${{ github.repository_owner }}/xfce-ext:latest \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 68f3cb2..773ddb3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "services/espejo"] - path = services/espejo + path = espejo url = https://github.com/mmguero/espejo branch = main [submodule "net/nginx-ldap"] - path = net/nginx-ldap + path = nginx-ldap url = https://github.com/mmguero/nginx-ldap branch = main [submodule "infosec/zeek"] - path = infosec/zeek + path = zeek url = https://github.com/mmguero/zeek-docker branch = main diff --git a/services/bitwarden/.env b/bitwarden/.env similarity index 100% rename from services/bitwarden/.env rename to bitwarden/.env diff --git a/services/bitwarden/data/.gitignore b/bitwarden/data/.gitignore similarity index 100% rename from services/bitwarden/data/.gitignore rename to bitwarden/data/.gitignore diff --git a/services/bitwarden/docker-compose.yml b/bitwarden/docker-compose.yml similarity index 100% rename from services/bitwarden/docker-compose.yml rename to bitwarden/docker-compose.yml diff --git a/services/booksonic/.dockerignore b/booksonic/.dockerignore similarity index 100% rename from services/booksonic/.dockerignore rename to booksonic/.dockerignore diff --git a/net/unifi/config/.gitignore b/booksonic/audiobooks/.gitignore similarity index 100% rename from net/unifi/config/.gitignore rename to booksonic/audiobooks/.gitignore diff --git a/net/unifi/config/data/.gitignore b/booksonic/config/.gitignore similarity index 100% rename from net/unifi/config/data/.gitignore rename to booksonic/config/.gitignore diff --git a/services/booksonic/docker-compose.yml b/booksonic/docker-compose.yml similarity index 100% rename from services/booksonic/docker-compose.yml rename to booksonic/docker-compose.yml diff --git a/services/booksonic/ldap_notes.txt b/booksonic/ldap_notes.txt similarity index 100% rename from services/booksonic/ldap_notes.txt rename to booksonic/ldap_notes.txt diff --git a/services/booksonic/ldap_setup.sh b/booksonic/ldap_setup.sh similarity index 100% rename from services/booksonic/ldap_setup.sh rename to booksonic/ldap_setup.sh diff --git a/net/unifi/config/logs/.gitignore b/booksonic/othermedia/.gitignore similarity index 100% rename from net/unifi/config/logs/.gitignore rename to booksonic/othermedia/.gitignore diff --git a/net/unifi/config/run/.gitignore b/booksonic/podcasts/.gitignore similarity index 100% rename from net/unifi/config/run/.gitignore rename to booksonic/podcasts/.gitignore diff --git a/services/booksonic/proxy/nginx.conf b/booksonic/proxy/nginx.conf similarity index 100% rename from services/booksonic/proxy/nginx.conf rename to booksonic/proxy/nginx.conf diff --git a/services/calibre-web/.dockerignore b/calibre-web/.dockerignore similarity index 100% rename from services/calibre-web/.dockerignore rename to calibre-web/.dockerignore diff --git a/services/calibre-web/docker-compose.yml b/calibre-web/docker-compose.yml similarity index 100% rename from services/calibre-web/docker-compose.yml rename to calibre-web/docker-compose.yml diff --git a/services/calibre-web/docker/Dockerfile b/calibre-web/docker/Dockerfile similarity index 96% rename from services/calibre-web/docker/Dockerfile rename to calibre-web/docker/Dockerfile index 85fdab8..1a2f239 100644 --- a/services/calibre-web/docker/Dockerfile +++ b/calibre-web/docker/Dockerfile @@ -2,7 +2,7 @@ FROM linuxserver/calibre-web LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/calibre-web' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/calibre-web' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/calibre-web' LABEL org.opencontainers.image.description='Dockerized Calibre-Web E-Book Server' diff --git a/services/calibre-web/docker/Dockerfile.arm32v7 b/calibre-web/docker/Dockerfile.arm32v7 similarity index 98% rename from services/calibre-web/docker/Dockerfile.arm32v7 rename to calibre-web/docker/Dockerfile.arm32v7 index a5eaf9b..22ef4a4 100644 --- a/services/calibre-web/docker/Dockerfile.arm32v7 +++ b/calibre-web/docker/Dockerfile.arm32v7 @@ -2,7 +2,7 @@ FROM linuxserver/calibre-web:arm32v7-latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/calibre-web' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/calibre-web' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/calibre-web' LABEL org.opencontainers.image.description='Dockerized Calibre-Web E-Book Server' diff --git a/infosec/capa/.gitignore b/capa/.gitignore similarity index 100% rename from infosec/capa/.gitignore rename to capa/.gitignore diff --git a/infosec/capa/Dockerfile b/capa/Dockerfile similarity index 98% rename from infosec/capa/Dockerfile rename to capa/Dockerfile index 30e01b8..9bdf499 100644 --- a/infosec/capa/Dockerfile +++ b/capa/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/infosec/capa' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/capa' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/capa' LABEL org.opencontainers.image.description='Dockerized capa' diff --git a/infosec/capa/README.md b/capa/README.md similarity index 100% rename from infosec/capa/README.md rename to capa/README.md diff --git a/infosec/capa/capa-docker.sh b/capa/capa-docker.sh similarity index 100% rename from infosec/capa/capa-docker.sh rename to capa/capa-docker.sh diff --git a/services/booksonic/audiobooks/.gitignore b/docker-registry/certs/.gitignore similarity index 100% rename from services/booksonic/audiobooks/.gitignore rename to docker-registry/certs/.gitignore diff --git a/services/docker-registry/run.sh b/docker-registry/run.sh similarity index 100% rename from services/docker-registry/run.sh rename to docker-registry/run.sh diff --git a/services/espejo b/espejo similarity index 100% rename from services/espejo rename to espejo diff --git a/services/gogs/docker-compose.yml b/gogs/docker-compose.yml similarity index 100% rename from services/gogs/docker-compose.yml rename to gogs/docker-compose.yml diff --git a/services/mattermost/.dockerignore b/mattermost/.dockerignore similarity index 100% rename from services/mattermost/.dockerignore rename to mattermost/.dockerignore diff --git a/services/mattermost/.env.template b/mattermost/.env.template similarity index 100% rename from services/mattermost/.env.template rename to mattermost/.env.template diff --git a/services/mattermost/.gitignore b/mattermost/.gitignore similarity index 100% rename from services/mattermost/.gitignore rename to mattermost/.gitignore diff --git a/services/mattermost/config.json.template b/mattermost/config.json.template similarity index 100% rename from services/mattermost/config.json.template rename to mattermost/config.json.template diff --git a/services/booksonic/config/.gitignore b/mattermost/data/.gitignore similarity index 100% rename from services/booksonic/config/.gitignore rename to mattermost/data/.gitignore diff --git a/services/mattermost/docker-compose.yml b/mattermost/docker-compose.yml similarity index 100% rename from services/mattermost/docker-compose.yml rename to mattermost/docker-compose.yml diff --git a/services/mattermost/docker/mattermost.Dockerfile b/mattermost/docker/mattermost.Dockerfile similarity index 98% rename from services/mattermost/docker/mattermost.Dockerfile rename to mattermost/docker/mattermost.Dockerfile index 93560b5..e235fba 100644 --- a/services/mattermost/docker/mattermost.Dockerfile +++ b/mattermost/docker/mattermost.Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/mattermost' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/mattermost' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/mattermost-server' LABEL org.opencontainers.image.description='Dockerized Mattermost Server' diff --git a/services/mattermost/docker/postgres.Dockerfile b/mattermost/docker/postgres.Dockerfile similarity index 100% rename from services/mattermost/docker/postgres.Dockerfile rename to mattermost/docker/postgres.Dockerfile diff --git a/db/minikeyvalue/Dockerfile b/minikeyvalue/Dockerfile similarity index 98% rename from db/minikeyvalue/Dockerfile rename to minikeyvalue/Dockerfile index 52c7007..7c70219 100644 --- a/db/minikeyvalue/Dockerfile +++ b/minikeyvalue/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/db/minikeyvalue' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/minikeyvalue' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/minikeyvalue' LABEL org.opencontainers.image.description='Dockerized minikeyvalue Key Value Store' diff --git a/db/minikeyvalue/supervisord.conf b/minikeyvalue/supervisord.conf similarity index 100% rename from db/minikeyvalue/supervisord.conf rename to minikeyvalue/supervisord.conf diff --git a/services/nextcloud/.dockerignore b/nextcloud/.dockerignore similarity index 100% rename from services/nextcloud/.dockerignore rename to nextcloud/.dockerignore diff --git a/services/booksonic/othermedia/.gitignore b/nextcloud/data/.gitignore similarity index 100% rename from services/booksonic/othermedia/.gitignore rename to nextcloud/data/.gitignore diff --git a/services/booksonic/podcasts/.gitignore b/nextcloud/db/.gitignore similarity index 100% rename from services/booksonic/podcasts/.gitignore rename to nextcloud/db/.gitignore diff --git a/services/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml similarity index 100% rename from services/nextcloud/docker-compose.yml rename to nextcloud/docker-compose.yml diff --git a/services/nextcloud/docker/Dockerfile b/nextcloud/docker/Dockerfile similarity index 93% rename from services/nextcloud/docker/Dockerfile rename to nextcloud/docker/Dockerfile index 2ac0237..af6780b 100644 --- a/services/nextcloud/docker/Dockerfile +++ b/nextcloud/docker/Dockerfile @@ -2,7 +2,7 @@ FROM nextcloud:latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/nextcloud' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nextcloud' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/nextcloud' LABEL org.opencontainers.image.description='Dockerized Nextcloud' diff --git a/services/nextcloud/docker/Dockerfile.arm32v7 b/nextcloud/docker/Dockerfile.arm32v7 similarity index 93% rename from services/nextcloud/docker/Dockerfile.arm32v7 rename to nextcloud/docker/Dockerfile.arm32v7 index 539cdfc..65bcb11 100644 --- a/services/nextcloud/docker/Dockerfile.arm32v7 +++ b/nextcloud/docker/Dockerfile.arm32v7 @@ -2,7 +2,7 @@ FROM arm32v7/nextcloud:latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/nextcloud' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nextcloud' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/nextcloud' LABEL org.opencontainers.image.description='Dockerized Nextcloud (arm32v7)' diff --git a/net/nginx-ldap b/nginx-ldap similarity index 100% rename from net/nginx-ldap rename to nginx-ldap diff --git a/services/nginx-proxy/config/proxy_overrides.conf b/nginx-proxy/config/proxy_overrides.conf similarity index 100% rename from services/nginx-proxy/config/proxy_overrides.conf rename to nginx-proxy/config/proxy_overrides.conf diff --git a/services/nginx-proxy/docker-compose.yml b/nginx-proxy/docker-compose.yml similarity index 100% rename from services/nginx-proxy/docker-compose.yml rename to nginx-proxy/docker-compose.yml diff --git a/net/nginx-securimage/docker-compose.yml b/nginx-securimage/docker-compose.yml similarity index 100% rename from net/nginx-securimage/docker-compose.yml rename to nginx-securimage/docker-compose.yml diff --git a/net/nginx-securimage/docker/nginx.Dockerfile b/nginx-securimage/docker/nginx.Dockerfile similarity index 95% rename from net/nginx-securimage/docker/nginx.Dockerfile rename to nginx-securimage/docker/nginx.Dockerfile index b703b34..780cd41 100644 --- a/net/nginx-securimage/docker/nginx.Dockerfile +++ b/nginx-securimage/docker/nginx.Dockerfile @@ -2,7 +2,7 @@ FROM trafex/alpine-nginx-php7:latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/net/nginx-securimage' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/nginx-securimage' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/nginx-securimage' LABEL org.opencontainers.image.description='Dockerized NGINX with Securimage PHP Captcha' diff --git a/net/nginx-securimage/nginx/server.conf b/nginx-securimage/nginx/server.conf similarity index 100% rename from net/nginx-securimage/nginx/server.conf rename to nginx-securimage/nginx/server.conf diff --git a/net/nginx-securimage/php/php-fpm-settings.conf b/nginx-securimage/php/php-fpm-settings.conf similarity index 100% rename from net/nginx-securimage/php/php-fpm-settings.conf rename to nginx-securimage/php/php-fpm-settings.conf diff --git a/net/nginx-securimage/php/php.ini b/nginx-securimage/php/php.ini similarity index 100% rename from net/nginx-securimage/php/php.ini rename to nginx-securimage/php/php.ini diff --git a/net/nginx-securimage/webcontent/index.php b/nginx-securimage/webcontent/index.php similarity index 100% rename from net/nginx-securimage/webcontent/index.php rename to nginx-securimage/webcontent/index.php diff --git a/services/openldap/docker-compose.yml b/openldap/docker-compose.yml similarity index 100% rename from services/openldap/docker-compose.yml rename to openldap/docker-compose.yml diff --git a/services/pihole/docker-compose.yml b/pihole/docker-compose.yml similarity index 100% rename from services/pihole/docker-compose.yml rename to pihole/docker-compose.yml diff --git a/services/pihole/etc-dnsmasq.d/.gitignore b/pihole/etc-dnsmasq.d/.gitignore similarity index 100% rename from services/pihole/etc-dnsmasq.d/.gitignore rename to pihole/etc-dnsmasq.d/.gitignore diff --git a/services/pihole/etc-dnsmasq.d/03-custom-dns.conf b/pihole/etc-dnsmasq.d/03-custom-dns.conf similarity index 100% rename from services/pihole/etc-dnsmasq.d/03-custom-dns.conf rename to pihole/etc-dnsmasq.d/03-custom-dns.conf diff --git a/services/pihole/etc-pihole/.gitignore b/pihole/etc-pihole/.gitignore similarity index 100% rename from services/pihole/etc-pihole/.gitignore rename to pihole/etc-pihole/.gitignore diff --git a/services/pihole/etc-pihole/custom.list b/pihole/etc-pihole/custom.list similarity index 100% rename from services/pihole/etc-pihole/custom.list rename to pihole/etc-pihole/custom.list diff --git a/services/pihole/var-log/.gitignore b/pihole/var-log/.gitignore similarity index 100% rename from services/pihole/var-log/.gitignore rename to pihole/var-log/.gitignore diff --git a/services/screego/docker-compose.yml b/screego/docker-compose.yml similarity index 100% rename from services/screego/docker-compose.yml rename to screego/docker-compose.yml diff --git a/comm/signal/Dockerfile b/signal/Dockerfile similarity index 98% rename from comm/signal/Dockerfile rename to signal/Dockerfile index 1e2f7ce..811676e 100644 --- a/comm/signal/Dockerfile +++ b/signal/Dockerfile @@ -11,7 +11,7 @@ FROM debian:buster-slim LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/comm/signal' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/signal' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/signal' LABEL org.opencontainers.image.description='Dockerized Signal (X11)' diff --git a/services/docker-registry/certs/.gitignore b/smtp4dev/certs/.gitignore similarity index 100% rename from services/docker-registry/certs/.gitignore rename to smtp4dev/certs/.gitignore diff --git a/services/smtp4dev/docker-compose.yml b/smtp4dev/docker-compose.yml similarity index 100% rename from services/smtp4dev/docker-compose.yml rename to smtp4dev/docker-compose.yml diff --git a/db/splunk/docker-compose.yml b/splunk/docker-compose.yml similarity index 100% rename from db/splunk/docker-compose.yml rename to splunk/docker-compose.yml diff --git a/services/step-ca/.dockerignore b/step-ca/.dockerignore similarity index 100% rename from services/step-ca/.dockerignore rename to step-ca/.dockerignore diff --git a/services/step-ca/.gitignore b/step-ca/.gitignore similarity index 100% rename from services/step-ca/.gitignore rename to step-ca/.gitignore diff --git a/services/step-ca/README.md b/step-ca/README.md similarity index 100% rename from services/step-ca/README.md rename to step-ca/README.md diff --git a/services/step-ca/docker-compose.yml b/step-ca/docker-compose.yml similarity index 100% rename from services/step-ca/docker-compose.yml rename to step-ca/docker-compose.yml diff --git a/services/mattermost/data/.gitignore b/step-ca/step/.gitignore similarity index 100% rename from services/mattermost/data/.gitignore rename to step-ca/step/.gitignore diff --git a/services/nextcloud/data/.gitignore b/step-ca/step/certs/.gitignore similarity index 100% rename from services/nextcloud/data/.gitignore rename to step-ca/step/certs/.gitignore diff --git a/services/nextcloud/db/.gitignore b/step-ca/step/config/.gitignore similarity index 100% rename from services/nextcloud/db/.gitignore rename to step-ca/step/config/.gitignore diff --git a/services/smtp4dev/certs/.gitignore b/step-ca/step/db/.gitignore similarity index 100% rename from services/smtp4dev/certs/.gitignore rename to step-ca/step/db/.gitignore diff --git a/services/step-ca/step/.gitignore b/step-ca/step/secrets/.gitignore similarity index 100% rename from services/step-ca/step/.gitignore rename to step-ca/step/secrets/.gitignore diff --git a/services/step-ca/step/certs/.gitignore b/step-ca/step/templates/.gitignore similarity index 100% rename from services/step-ca/step/certs/.gitignore rename to step-ca/step/templates/.gitignore diff --git a/net/stunnel/Dockerfile b/stunnel/Dockerfile similarity index 93% rename from net/stunnel/Dockerfile rename to stunnel/Dockerfile index 380db24..33ad277 100644 --- a/net/stunnel/Dockerfile +++ b/stunnel/Dockerfile @@ -2,7 +2,7 @@ FROM vimagick/stunnel:latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/net/stunnel' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/stunnel' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/stunnel' LABEL org.opencontainers.image.description='Dockerized stunnel' diff --git a/comm/teams/Dockerfile b/teams/Dockerfile similarity index 98% rename from comm/teams/Dockerfile rename to teams/Dockerfile index 33bf8ef..4751a3e 100644 --- a/comm/teams/Dockerfile +++ b/teams/Dockerfile @@ -11,7 +11,7 @@ FROM debian:buster-slim LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/comm/teams' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/teams' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/teams' LABEL org.opencontainers.image.description='Dockerized Microsoft Teams (X11)' diff --git a/services/step-ca/step/config/.gitignore b/traefix-proxy/certs/.gitignore similarity index 100% rename from services/step-ca/step/config/.gitignore rename to traefix-proxy/certs/.gitignore diff --git a/services/traefix-proxy/docker-compose.yml b/traefix-proxy/docker-compose.yml similarity index 100% rename from services/traefix-proxy/docker-compose.yml rename to traefix-proxy/docker-compose.yml diff --git a/services/step-ca/step/db/.gitignore b/traefix-proxy/letsencrypt/.gitignore similarity index 100% rename from services/step-ca/step/db/.gitignore rename to traefix-proxy/letsencrypt/.gitignore diff --git a/services/tunneler/Dockerfile b/tunneler/Dockerfile similarity index 99% rename from services/tunneler/Dockerfile rename to tunneler/Dockerfile index 498312b..b2c9fd6 100644 --- a/services/tunneler/Dockerfile +++ b/tunneler/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster-slim LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/tunneler' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/tunneler' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/tunneler' LABEL org.opencontainers.image.description='Dockerized Tunneling Services' diff --git a/services/tunneler/croc_relay_entrypoint.sh b/tunneler/croc_relay_entrypoint.sh similarity index 100% rename from services/tunneler/croc_relay_entrypoint.sh rename to tunneler/croc_relay_entrypoint.sh diff --git a/services/tunneler/docker-compose.yml b/tunneler/docker-compose.yml similarity index 100% rename from services/tunneler/docker-compose.yml rename to tunneler/docker-compose.yml diff --git a/services/tunneler/supervisord.conf b/tunneler/supervisord.conf similarity index 100% rename from services/tunneler/supervisord.conf rename to tunneler/supervisord.conf diff --git a/net/unifi/Dockerfile b/unifi/Dockerfile similarity index 100% rename from net/unifi/Dockerfile rename to unifi/Dockerfile diff --git a/services/step-ca/step/secrets/.gitignore b/unifi/config/.gitignore similarity index 100% rename from services/step-ca/step/secrets/.gitignore rename to unifi/config/.gitignore diff --git a/services/step-ca/step/templates/.gitignore b/unifi/config/data/.gitignore similarity index 100% rename from services/step-ca/step/templates/.gitignore rename to unifi/config/data/.gitignore diff --git a/services/traefix-proxy/certs/.gitignore b/unifi/config/logs/.gitignore similarity index 100% rename from services/traefix-proxy/certs/.gitignore rename to unifi/config/logs/.gitignore diff --git a/services/traefix-proxy/letsencrypt/.gitignore b/unifi/config/run/.gitignore similarity index 100% rename from services/traefix-proxy/letsencrypt/.gitignore rename to unifi/config/run/.gitignore diff --git a/net/unifi/docker-compose.yml b/unifi/docker-compose.yml similarity index 100% rename from net/unifi/docker-compose.yml rename to unifi/docker-compose.yml diff --git a/net/unifi/entrypoint.sh b/unifi/entrypoint.sh similarity index 100% rename from net/unifi/entrypoint.sh rename to unifi/entrypoint.sh diff --git a/services/vault/.dockerignore b/vault/.dockerignore similarity index 100% rename from services/vault/.dockerignore rename to vault/.dockerignore diff --git a/services/vault/Dockerfile b/vault/Dockerfile similarity index 97% rename from services/vault/Dockerfile rename to vault/Dockerfile index d3e85ca..b127202 100644 --- a/services/vault/Dockerfile +++ b/vault/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.11 LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/services/vault' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/vault' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='mmguero/vault' LABEL org.opencontainers.image.description='Dockerized Hashicorp Vault' diff --git a/services/vault/config/vault-config.json b/vault/config/vault-config.json similarity index 100% rename from services/vault/config/vault-config.json rename to vault/config/vault-config.json diff --git a/services/vault/docker-compose.yml b/vault/docker-compose.yml similarity index 100% rename from services/vault/docker-compose.yml rename to vault/docker-compose.yml diff --git a/desktop/xfce/Dockerfile b/xfce/Dockerfile similarity index 99% rename from desktop/xfce/Dockerfile rename to xfce/Dockerfile index 25b8cd6..5727271 100644 --- a/desktop/xfce/Dockerfile +++ b/xfce/Dockerfile @@ -2,7 +2,7 @@ FROM ghcr.io/mmguero/xfce-base:latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/desktop/xfce' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/xfce' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='ghcr.io/mmguero/xfce:latest' LABEL org.opencontainers.image.description='Dockerized XFCE with my own special blend of herbs and spices' diff --git a/desktop/xfce/xfce-base.Dockerfile b/xfce/xfce-base.Dockerfile similarity index 100% rename from desktop/xfce/xfce-base.Dockerfile rename to xfce/xfce-base.Dockerfile diff --git a/desktop/xfce/xfce-ext.Dockerfile b/xfce/xfce-ext.Dockerfile similarity index 98% rename from desktop/xfce/xfce-ext.Dockerfile rename to xfce/xfce-ext.Dockerfile index b68fc14..57b5bbb 100644 --- a/desktop/xfce/xfce-ext.Dockerfile +++ b/xfce/xfce-ext.Dockerfile @@ -6,7 +6,7 @@ FROM ghcr.io/mmguero/xfce:latest LABEL maintainer="mero.mero.guero@gmail.com" LABEL org.opencontainers.image.authors='mero.mero.guero@gmail.com' -LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/desktop/xfce' +LABEL org.opencontainers.image.url='https://github.com/mmguero/docker/tree/master/xfce' LABEL org.opencontainers.image.source='https://github.com/mmguero/docker' LABEL org.opencontainers.image.title='ghcr.io/mmguero/xfce-ext:latest' LABEL org.opencontainers.image.description='Dockerized XFCE with tools for binding docker and libvirt access' @@ -29,6 +29,7 @@ RUN cd /tmp && \ dnsmasq-base \ ebtables \ gir1.2-spiceclientgtk-3.0 \ + iptables \ libbz2-dev \ libffi-dev \ libfreetype6-dev \ diff --git a/infosec/zeek b/zeek similarity index 100% rename from infosec/zeek rename to zeek