containers: Rebrand from docker to more generic containers

haiku · Nov 25, 2020 · 0cc0af5 · 0cc0af5
1 parent 69bee41
commit 0cc0af5
Show file tree

Hide file tree

Showing 133 changed files with 1 addition and 1 deletion.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Treating Haiku's infrastructure as cattle instead of kittens since 2017.
 ## Directories
 
   * docs - Full documentation on Haiku's infrastructure
-  * docker - Docker manifests to build and deploy containers
+  * containers - Manifests to build and deploy containers
   * data - Static, git tracked files which can be bind in containers.
   * playground - Things that we're experimenting with. Not used in production.
 

diff --git a/docker/README.md → containers/README.md b/docker/README.md → containers/README.md
diff --git a/docker/buildmaster/.env → containers/buildmaster/.env b/docker/buildmaster/.env → containers/buildmaster/.env
diff --git a/docker/buildmaster/docker-compose.yaml → containers/buildmaster/docker-compose.yaml b/docker/buildmaster/docker-compose.yaml → containers/buildmaster/docker-compose.yaml
diff --git a/docker/cgit/Dockerfile → containers/cgit/Dockerfile b/docker/cgit/Dockerfile → containers/cgit/Dockerfile
diff --git a/docker/cgit/LICENSE → containers/cgit/LICENSE b/docker/cgit/LICENSE → containers/cgit/LICENSE
diff --git a/docker/cgit/Makefile → containers/cgit/Makefile b/docker/cgit/Makefile → containers/cgit/Makefile
diff --git a/docker/cgit/README.md → containers/cgit/README.md b/docker/cgit/README.md → containers/cgit/README.md
diff --git a/docker/cgit/assets/401.html → containers/cgit/assets/401.html b/docker/cgit/assets/401.html → containers/cgit/assets/401.html
diff --git a/docker/cgit/assets/404.html → containers/cgit/assets/404.html b/docker/cgit/assets/404.html → containers/cgit/assets/404.html
diff --git a/docker/cgit/assets/cgitrc.template → containers/cgit/assets/cgitrc.template b/docker/cgit/assets/cgitrc.template → containers/cgit/assets/cgitrc.template
diff --git a/docker/cgit/assets/commit-link-filter.sh → containers/cgit/assets/commit-link-filter.sh b/docker/cgit/assets/commit-link-filter.sh → containers/cgit/assets/commit-link-filter.sh
diff --git a/docker/cgit/assets/default.conf → containers/cgit/assets/default.conf b/docker/cgit/assets/default.conf → containers/cgit/assets/default.conf
diff --git a/docker/cgit/assets/haiku-cgit.css → containers/cgit/assets/haiku-cgit.css b/docker/cgit/assets/haiku-cgit.css → containers/cgit/assets/haiku-cgit.css
diff --git a/docker/cgit/assets/haiku-logo.png → containers/cgit/assets/haiku-logo.png b/docker/cgit/assets/haiku-logo.png → containers/cgit/assets/haiku-logo.png
diff --git a/docker/cgit/assets/startup → containers/cgit/assets/startup b/docker/cgit/assets/startup → containers/cgit/assets/startup
diff --git a/docker/cgit/assets/syntax-highlighting.sh → ...ainers/cgit/assets/syntax-highlighting.sh b/docker/cgit/assets/syntax-highlighting.sh → ...ainers/cgit/assets/syntax-highlighting.sh
diff --git a/docker/concourse-web/Dockerfile → containers/concourse-web/Dockerfile b/docker/concourse-web/Dockerfile → containers/concourse-web/Dockerfile
diff --git a/docker/concourse-web/Makefile → containers/concourse-web/Makefile b/docker/concourse-web/Makefile → containers/concourse-web/Makefile
diff --git a/docker/concourse-web/README.md → containers/concourse-web/README.md b/docker/concourse-web/README.md → containers/concourse-web/README.md
diff --git a/docker/concourse-web/entry.sh → containers/concourse-web/entry.sh b/docker/concourse-web/entry.sh → containers/concourse-web/entry.sh
diff --git a/docker/discourse/Dockerfile → containers/discourse/Dockerfile b/docker/discourse/Dockerfile → containers/discourse/Dockerfile
diff --git a/docker/discourse/Makefile → containers/discourse/Makefile b/docker/discourse/Makefile → containers/discourse/Makefile
diff --git a/docker/discourse/README.md → containers/discourse/README.md b/docker/discourse/README.md → containers/discourse/README.md
diff --git a/docker/discourse/assets/images/bikeshed.png → ...ners/discourse/assets/images/bikeshed.png b/docker/discourse/assets/images/bikeshed.png → ...ners/discourse/assets/images/bikeshed.png
diff --git a/...course/assets/images/haiku_logo_white.svg → ...course/assets/images/haiku_logo_white.svg b/...course/assets/images/haiku_logo_white.svg → ...course/assets/images/haiku_logo_white.svg
diff --git a/docker/discourse/init → containers/discourse/init b/docker/discourse/init → containers/discourse/init
diff --git a/docker/discourse/server/discourse-nginx.conf → ...ers/discourse/server/discourse-nginx.conf b/docker/discourse/server/discourse-nginx.conf → ...ers/discourse/server/discourse-nginx.conf
diff --git a/docker/discourse/supervisord.conf → containers/discourse/supervisord.conf b/docker/discourse/supervisord.conf → containers/discourse/supervisord.conf
diff --git a/docker/discourse/test.env → containers/discourse/test.env b/docker/discourse/test.env → containers/discourse/test.env
diff --git a/docker/discuss-builder/Dockerfile → containers/discuss-builder/Dockerfile b/docker/discuss-builder/Dockerfile → containers/discuss-builder/Dockerfile
diff --git a/docker/discuss-builder/Makefile → containers/discuss-builder/Makefile b/docker/discuss-builder/Makefile → containers/discuss-builder/Makefile
diff --git a/...er/discuss-builder/containers/discuss.yml → ...rs/discuss-builder/containers/discuss.yml b/...er/discuss-builder/containers/discuss.yml → ...rs/discuss-builder/containers/discuss.yml
diff --git a/docker/discuss-builder/images/bikeshed.png → ...iners/discuss-builder/images/bikeshed.png b/docker/discuss-builder/images/bikeshed.png → ...iners/discuss-builder/images/bikeshed.png
diff --git a/...scuss-builder/images/haiku_logo_white.svg → ...scuss-builder/images/haiku_logo_white.svg b/...scuss-builder/images/haiku_logo_white.svg → ...scuss-builder/images/haiku_logo_white.svg
diff --git a/docker/discuss-builder/makedb.sh → containers/discuss-builder/makedb.sh b/docker/discuss-builder/makedb.sh → containers/discuss-builder/makedb.sh
diff --git a/docker/download/Dockerfile → containers/download/Dockerfile b/docker/download/Dockerfile → containers/download/Dockerfile
diff --git a/docker/download/Makefile → containers/download/Makefile b/docker/download/Makefile → containers/download/Makefile
diff --git a/docker/download/requirements.txt → containers/download/requirements.txt b/docker/download/requirements.txt → containers/download/requirements.txt
diff --git a/docker/download/site-generator → containers/download/site-generator b/docker/download/site-generator → containers/download/site-generator
diff --git a/docker/download/supervisord.conf → containers/download/supervisord.conf b/docker/download/supervisord.conf → containers/download/supervisord.conf
diff --git a/docker/general-worker/Dockerfile → containers/general-worker/Dockerfile b/docker/general-worker/Dockerfile → containers/general-worker/Dockerfile
diff --git a/docker/general-worker/Dockerfile.ubuntu → containers/general-worker/Dockerfile.ubuntu b/docker/general-worker/Dockerfile.ubuntu → containers/general-worker/Dockerfile.ubuntu
diff --git a/docker/general-worker/Makefile → containers/general-worker/Makefile b/docker/general-worker/Makefile → containers/general-worker/Makefile
diff --git a/docker/gerrit/Dockerfile → containers/gerrit/Dockerfile b/docker/gerrit/Dockerfile → containers/gerrit/Dockerfile
diff --git a/docker/gerrit/LICENSE → containers/gerrit/LICENSE b/docker/gerrit/LICENSE → containers/gerrit/LICENSE
diff --git a/docker/gerrit/Makefile → containers/gerrit/Makefile b/docker/gerrit/Makefile → containers/gerrit/Makefile
diff --git a/docker/gerrit/README.md → containers/gerrit/README.md b/docker/gerrit/README.md → containers/gerrit/README.md
diff --git a/docker/gerrit/gerrit-entrypoint.sh → containers/gerrit/gerrit-entrypoint.sh b/docker/gerrit/gerrit-entrypoint.sh → containers/gerrit/gerrit-entrypoint.sh
diff --git a/docker/gerrit/gerrit-start.sh → containers/gerrit/gerrit-start.sh b/docker/gerrit/gerrit-start.sh → containers/gerrit/gerrit-start.sh
diff --git a/docker/gerrit/v2.16/Dockerfile → containers/gerrit/v2.16/Dockerfile b/docker/gerrit/v2.16/Dockerfile → containers/gerrit/v2.16/Dockerfile
diff --git a/docker/gerrit/v2.16/LICENSE → containers/gerrit/v2.16/LICENSE b/docker/gerrit/v2.16/LICENSE → containers/gerrit/v2.16/LICENSE
diff --git a/docker/gerrit/v2.16/Makefile → containers/gerrit/v2.16/Makefile b/docker/gerrit/v2.16/Makefile → containers/gerrit/v2.16/Makefile
diff --git a/docker/gerrit/v2.16/README.md → containers/gerrit/v2.16/README.md b/docker/gerrit/v2.16/README.md → containers/gerrit/v2.16/README.md
diff --git a/docker/gerrit/v2.16/gerrit-entrypoint.sh → containers/gerrit/v2.16/gerrit-entrypoint.sh b/docker/gerrit/v2.16/gerrit-entrypoint.sh → containers/gerrit/v2.16/gerrit-entrypoint.sh
diff --git a/docker/gerrit/v2.16/gerrit-start.sh → containers/gerrit/v2.16/gerrit-start.sh b/docker/gerrit/v2.16/gerrit-start.sh → containers/gerrit/v2.16/gerrit-start.sh
diff --git a/docker/gerrit/v3.2/Dockerfile → containers/gerrit/v3.2/Dockerfile b/docker/gerrit/v3.2/Dockerfile → containers/gerrit/v3.2/Dockerfile
diff --git a/docker/gerrit/v3.2/LICENSE → containers/gerrit/v3.2/LICENSE b/docker/gerrit/v3.2/LICENSE → containers/gerrit/v3.2/LICENSE
diff --git a/docker/gerrit/v3.2/Makefile → containers/gerrit/v3.2/Makefile b/docker/gerrit/v3.2/Makefile → containers/gerrit/v3.2/Makefile
diff --git a/docker/gerrit/v3.2/README.md → containers/gerrit/v3.2/README.md b/docker/gerrit/v3.2/README.md → containers/gerrit/v3.2/README.md
diff --git a/docker/gerrit/v3.2/gerrit-entrypoint.sh → containers/gerrit/v3.2/gerrit-entrypoint.sh b/docker/gerrit/v3.2/gerrit-entrypoint.sh → containers/gerrit/v3.2/gerrit-entrypoint.sh
diff --git a/docker/gerrit/v3.2/gerrit-start.sh → containers/gerrit/v3.2/gerrit-start.sh b/docker/gerrit/v3.2/gerrit-start.sh → containers/gerrit/v3.2/gerrit-start.sh
diff --git a/docker/irker/Dockerfile → containers/irker/Dockerfile b/docker/irker/Dockerfile → containers/irker/Dockerfile
diff --git a/docker/irker/Makefile → containers/irker/Makefile b/docker/irker/Makefile → containers/irker/Makefile
diff --git a/docker/nginx/Dockerfile → containers/nginx/Dockerfile b/docker/nginx/Dockerfile → containers/nginx/Dockerfile
diff --git a/docker/nginx/Makefile → containers/nginx/Makefile b/docker/nginx/Makefile → containers/nginx/Makefile
diff --git a/docker/nginx/auto-reload.sh → containers/nginx/auto-reload.sh b/docker/nginx/auto-reload.sh → containers/nginx/auto-reload.sh
diff --git a/docker/nginx/entrypoint.sh → containers/nginx/entrypoint.sh b/docker/nginx/entrypoint.sh → containers/nginx/entrypoint.sh
diff --git a/docker/node_exporter/Dockerfile → containers/node_exporter/Dockerfile b/docker/node_exporter/Dockerfile → containers/node_exporter/Dockerfile
diff --git a/docker/node_exporter/Makefile → containers/node_exporter/Makefile b/docker/node_exporter/Makefile → containers/node_exporter/Makefile
diff --git a/docker/persistsync/Dockerfile → containers/persistsync/Dockerfile b/docker/persistsync/Dockerfile → containers/persistsync/Dockerfile
diff --git a/docker/persistsync/Makefile → containers/persistsync/Makefile b/docker/persistsync/Makefile → containers/persistsync/Makefile
diff --git a/docker/persistsync/README.md → containers/persistsync/README.md b/docker/persistsync/README.md → containers/persistsync/README.md
diff --git a/docker/persistsync/pvsync.sh → containers/persistsync/pvsync.sh b/docker/persistsync/pvsync.sh → containers/persistsync/pvsync.sh
diff --git a/docker/pootle/Dockerfile → containers/pootle/Dockerfile b/docker/pootle/Dockerfile → containers/pootle/Dockerfile
diff --git a/docker/pootle/README.md → containers/pootle/README.md b/docker/pootle/README.md → containers/pootle/README.md
diff --git a/docker/pootle/nginx/default → containers/pootle/nginx/default b/docker/pootle/nginx/default → containers/pootle/nginx/default
diff --git a/docker/pootle/pootle-entrypoint.sh → containers/pootle/pootle-entrypoint.sh b/docker/pootle/pootle-entrypoint.sh → containers/pootle/pootle-entrypoint.sh
diff --git a/docker/pootle/requirements.txt → containers/pootle/requirements.txt b/docker/pootle/requirements.txt → containers/pootle/requirements.txt
diff --git a/docker/pootle/scripts/fingerprint.py → containers/pootle/scripts/fingerprint.py b/docker/pootle/scripts/fingerprint.py → containers/pootle/scripts/fingerprint.py
diff --git a/.../pootle/scripts/finish_output_catalogs.py → .../pootle/scripts/finish_output_catalogs.py b/.../pootle/scripts/finish_output_catalogs.py → .../pootle/scripts/finish_output_catalogs.py
diff --git a/...ripts/import_templates_from_repository.py → ...ripts/import_templates_from_repository.py b/...ripts/import_templates_from_repository.py → ...ripts/import_templates_from_repository.py
diff --git a/docker/pootle/scripts/synchronize-cron → containers/pootle/scripts/synchronize-cron b/docker/pootle/scripts/synchronize-cron → containers/pootle/scripts/synchronize-cron
diff --git a/docker/pootle/scripts/synchronize.py → containers/pootle/scripts/synchronize.py b/docker/pootle/scripts/synchronize.py → containers/pootle/scripts/synchronize.py
diff --git a/docker/pootle/supervisor/cron.conf → containers/pootle/supervisor/cron.conf b/docker/pootle/supervisor/cron.conf → containers/pootle/supervisor/cron.conf
diff --git a/docker/pootle/supervisor/nginx.conf → containers/pootle/supervisor/nginx.conf b/docker/pootle/supervisor/nginx.conf → containers/pootle/supervisor/nginx.conf
diff --git a/docker/pootle/supervisor/pootle.conf → containers/pootle/supervisor/pootle.conf b/docker/pootle/supervisor/pootle.conf → containers/pootle/supervisor/pootle.conf
diff --git a/docker/pootle/sync-config.toml.example → containers/pootle/sync-config.toml.example b/docker/pootle/sync-config.toml.example → containers/pootle/sync-config.toml.example
diff --git a/docker/pootle/synchronize-email-template.txt → ...ers/pootle/synchronize-email-template.txt b/docker/pootle/synchronize-email-template.txt → ...ers/pootle/synchronize-email-template.txt
diff --git a/docker/pootle/synchronize-template.html → containers/pootle/synchronize-template.html b/docker/pootle/synchronize-template.html → containers/pootle/synchronize-template.html
diff --git a/docker/ports-mirror/Dockerfile → containers/ports-mirror/Dockerfile b/docker/ports-mirror/Dockerfile → containers/ports-mirror/Dockerfile
diff --git a/docker/ports-mirror/Makefile → containers/ports-mirror/Makefile b/docker/ports-mirror/Makefile → containers/ports-mirror/Makefile
diff --git a/docker/ports-mirror/README.md → containers/ports-mirror/README.md b/docker/ports-mirror/README.md → containers/ports-mirror/README.md
diff --git a/docker/ports-mirror/lighttpd.conf → containers/ports-mirror/lighttpd.conf b/docker/ports-mirror/lighttpd.conf → containers/ports-mirror/lighttpd.conf
diff --git a/docker/ports-mirror/supervisord.conf → containers/ports-mirror/supervisord.conf b/docker/ports-mirror/supervisord.conf → containers/ports-mirror/supervisord.conf
diff --git a/docker/ports-mirror/update-ports-mirror → containers/ports-mirror/update-ports-mirror b/docker/ports-mirror/update-ports-mirror → containers/ports-mirror/update-ports-mirror
diff --git a/docker/repo-mirror/Dockerfile → containers/repo-mirror/Dockerfile b/docker/repo-mirror/Dockerfile → containers/repo-mirror/Dockerfile
diff --git a/docker/repo-mirror/Makefile → containers/repo-mirror/Makefile b/docker/repo-mirror/Makefile → containers/repo-mirror/Makefile
diff --git a/docker/repo-mirror/README.md → containers/repo-mirror/README.md b/docker/repo-mirror/README.md → containers/repo-mirror/README.md
diff --git a/docker/repo-mirror/run → containers/repo-mirror/run b/docker/repo-mirror/run → containers/repo-mirror/run
diff --git a/docker/sshutility/Dockerfile → containers/sshutility/Dockerfile b/docker/sshutility/Dockerfile → containers/sshutility/Dockerfile
diff --git a/docker/sshutility/Makefile → containers/sshutility/Makefile b/docker/sshutility/Makefile → containers/sshutility/Makefile
diff --git a/docker/sshutility/entrypoint.sh → containers/sshutility/entrypoint.sh b/docker/sshutility/entrypoint.sh → containers/sshutility/entrypoint.sh
diff --git a/docker/sshutility/keys/axeld.pub → containers/sshutility/keys/axeld.pub b/docker/sshutility/keys/axeld.pub → containers/sshutility/keys/axeld.pub
diff --git a/docker/sshutility/keys/kallisti5.pub → containers/sshutility/keys/kallisti5.pub b/docker/sshutility/keys/kallisti5.pub → containers/sshutility/keys/kallisti5.pub
diff --git a/docker/sshutility/keys/mmlr.pub → containers/sshutility/keys/mmlr.pub b/docker/sshutility/keys/mmlr.pub → containers/sshutility/keys/mmlr.pub
diff --git a/docker/sshutility/keys/nielx.pub → containers/sshutility/keys/nielx.pub b/docker/sshutility/keys/nielx.pub → containers/sshutility/keys/nielx.pub
diff --git a/docker/sshutility/keys/pulkomandy.pub → containers/sshutility/keys/pulkomandy.pub b/docker/sshutility/keys/pulkomandy.pub → containers/sshutility/keys/pulkomandy.pub
diff --git a/docker/sshutility/keys/waddlesplash.pub → containers/sshutility/keys/waddlesplash.pub b/docker/sshutility/keys/waddlesplash.pub → containers/sshutility/keys/waddlesplash.pub
diff --git a/docker/toolchain-worker/Dockerfile → containers/toolchain-worker/Dockerfile b/docker/toolchain-worker/Dockerfile → containers/toolchain-worker/Dockerfile
diff --git a/docker/toolchain-worker/Makefile → containers/toolchain-worker/Makefile b/docker/toolchain-worker/Makefile → containers/toolchain-worker/Makefile
diff --git a/docker/toolchain-worker/README.md → containers/toolchain-worker/README.md b/docker/toolchain-worker/README.md → containers/toolchain-worker/README.md
diff --git a/docker/trac/Dockerfile → containers/trac/Dockerfile b/docker/trac/Dockerfile → containers/trac/Dockerfile
diff --git a/docker/trac/Makefile → containers/trac/Makefile b/docker/trac/Makefile → containers/trac/Makefile
diff --git a/docker/trac/requirements.txt → containers/trac/requirements.txt b/docker/trac/requirements.txt → containers/trac/requirements.txt
diff --git a/docker/userguide/Dockerfile → containers/userguide/Dockerfile b/docker/userguide/Dockerfile → containers/userguide/Dockerfile
diff --git a/docker/userguide/README.md → containers/userguide/README.md b/docker/userguide/README.md → containers/userguide/README.md
diff --git a/docker/wip/nginx-auto/Dockerfile → containers/wip/nginx-auto/Dockerfile b/docker/wip/nginx-auto/Dockerfile → containers/wip/nginx-auto/Dockerfile
diff --git a/docker/wip/nginx-auto/auto-reload.sh → containers/wip/nginx-auto/auto-reload.sh b/docker/wip/nginx-auto/auto-reload.sh → containers/wip/nginx-auto/auto-reload.sh
diff --git a/docker/wip/nginx-auto/build.sh → containers/wip/nginx-auto/build.sh b/docker/wip/nginx-auto/build.sh → containers/wip/nginx-auto/build.sh
diff --git a/docker/wip/nginx-auto/entrypoint.sh → containers/wip/nginx-auto/entrypoint.sh b/docker/wip/nginx-auto/entrypoint.sh → containers/wip/nginx-auto/entrypoint.sh
diff --git a/docker/wip/nginx-cache/create.sh → containers/wip/nginx-cache/create.sh b/docker/wip/nginx-cache/create.sh → containers/wip/nginx-cache/create.sh
diff --git a/docker/wip/nginx-cache/generate_conf.sh → containers/wip/nginx-cache/generate_conf.sh b/docker/wip/nginx-cache/generate_conf.sh → containers/wip/nginx-cache/generate_conf.sh
diff --git a/docker/wip/nginx-cache/nginx.conf → containers/wip/nginx-cache/nginx.conf b/docker/wip/nginx-cache/nginx.conf → containers/wip/nginx-cache/nginx.conf
diff --git a/docker/wip/nginx-cache/nginx.conf.bottom → containers/wip/nginx-cache/nginx.conf.bottom b/docker/wip/nginx-cache/nginx.conf.bottom → containers/wip/nginx-cache/nginx.conf.bottom
diff --git a/docker/wip/nginx-cache/nginx.conf.top → containers/wip/nginx-cache/nginx.conf.top b/docker/wip/nginx-cache/nginx.conf.top → containers/wip/nginx-cache/nginx.conf.top
diff --git a/docker/wip/nginx-cache/reload.sh → containers/wip/nginx-cache/reload.sh b/docker/wip/nginx-cache/reload.sh → containers/wip/nginx-cache/reload.sh
diff --git a/docker/wip/nginx-frontend/create.sh → containers/wip/nginx-frontend/create.sh b/docker/wip/nginx-frontend/create.sh → containers/wip/nginx-frontend/create.sh
diff --git a/docker/wip/nginx-frontend/nginx.conf → containers/wip/nginx-frontend/nginx.conf b/docker/wip/nginx-frontend/nginx.conf → containers/wip/nginx-frontend/nginx.conf
diff --git a/docker/wip/nginx-frontend/reload.sh → containers/wip/nginx-frontend/reload.sh b/docker/wip/nginx-frontend/reload.sh → containers/wip/nginx-frontend/reload.sh
diff --git a/docker/wip/u2f/Dockerfile → containers/wip/u2f/Dockerfile b/docker/wip/u2f/Dockerfile → containers/wip/u2f/Dockerfile
diff --git a/docker/wip/u2f/Makefile → containers/wip/u2f/Makefile b/docker/wip/u2f/Makefile → containers/wip/u2f/Makefile
diff --git a/docker/wip/u2f/u2fval.conf → containers/wip/u2f/u2fval.conf b/docker/wip/u2f/u2fval.conf → containers/wip/u2f/u2fval.conf