From ec50392609179e2c5bd36d5d7a370d27edc3bd72 Mon Sep 17 00:00:00 2001 From: Tom Wiesing Date: Wed, 3 Apr 2024 11:48:48 +0200 Subject: [PATCH] internal/wisski: Move dockerfile and image build into a subdirectory --- internal/wisski/ingredient/barrel/barrel/README.md | 5 +++-- .../ingredient/barrel/barrel/{ => barrel}/.dockerignore | 0 .../wisski/ingredient/barrel/barrel/{ => barrel}/Dockerfile | 0 .../barrel/barrel/{ => barrel}/apache.d/conf/ports.conf | 0 .../barrel/{ => barrel}/apache.d/mods-available/iipsrv.conf | 0 .../barrel/{ => barrel}/apache.d/sites-available/wisski.conf | 0 .../barrel/barrel/{ => barrel}/php.ini.d/opcache-devel.ini | 0 .../barrel/barrel/{ => barrel}/php.ini.d/opcache-prod.ini | 0 .../barrel/barrel/{ => barrel}/php.ini.d/wisski.ini | 0 .../barrel/barrel/{ => barrel}/scripts/entrypoint.sh | 0 .../barrel/barrel/{ => barrel}/scripts/user_shell.sh | 0 .../wisski/ingredient/barrel/barrel/{ => barrel}/ssh/keys.sh | 0 .../ingredient/barrel/barrel/{ => barrel}/ssh/sshd_config | 0 .../ingredient/barrel/barrel/{ => barrel}/ssh/start.sh | 0 internal/wisski/ingredient/barrel/barrel/docker-compose.yml | 2 +- 15 files changed, 4 insertions(+), 3 deletions(-) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/.dockerignore (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/Dockerfile (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/apache.d/conf/ports.conf (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/apache.d/mods-available/iipsrv.conf (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/apache.d/sites-available/wisski.conf (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/php.ini.d/opcache-devel.ini (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/php.ini.d/opcache-prod.ini (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/php.ini.d/wisski.ini (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/scripts/entrypoint.sh (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/scripts/user_shell.sh (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/ssh/keys.sh (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/ssh/sshd_config (100%) rename internal/wisski/ingredient/barrel/barrel/{ => barrel}/ssh/start.sh (100%) diff --git a/internal/wisski/ingredient/barrel/barrel/README.md b/internal/wisski/ingredient/barrel/barrel/README.md index c99daab..29c46d2 100644 --- a/internal/wisski/ingredient/barrel/barrel/README.md +++ b/internal/wisski/ingredient/barrel/barrel/README.md @@ -7,9 +7,10 @@ These are required for the container to function properly. DO NOT EDIT THESE, changes will be overwritten during the next rebuild. - `docker-compose.yml`: Defines how the docker image is run -- `Dockerfile`: Dockerfile used to run the actual image +- `barrel/`: Contains Dockerfile for actual image to be used + - `Dockerfile`: Used to build the image + - `apache.d`, `scripts`, `php.ini.d`: Resources used during the docker-compose build. - `.env`: Parameters for `docker-compose.yml` -- `apache.d`, `scripts`, `php.ini.d`: Resources used during the docker-compose build. To tweak parameters inside the `.env` file, rebuild the image via `wdcli rebuild`. diff --git a/internal/wisski/ingredient/barrel/barrel/.dockerignore b/internal/wisski/ingredient/barrel/barrel/barrel/.dockerignore similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/.dockerignore rename to internal/wisski/ingredient/barrel/barrel/barrel/.dockerignore diff --git a/internal/wisski/ingredient/barrel/barrel/Dockerfile b/internal/wisski/ingredient/barrel/barrel/barrel/Dockerfile similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/Dockerfile rename to internal/wisski/ingredient/barrel/barrel/barrel/Dockerfile diff --git a/internal/wisski/ingredient/barrel/barrel/apache.d/conf/ports.conf b/internal/wisski/ingredient/barrel/barrel/barrel/apache.d/conf/ports.conf similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/apache.d/conf/ports.conf rename to internal/wisski/ingredient/barrel/barrel/barrel/apache.d/conf/ports.conf diff --git a/internal/wisski/ingredient/barrel/barrel/apache.d/mods-available/iipsrv.conf b/internal/wisski/ingredient/barrel/barrel/barrel/apache.d/mods-available/iipsrv.conf similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/apache.d/mods-available/iipsrv.conf rename to internal/wisski/ingredient/barrel/barrel/barrel/apache.d/mods-available/iipsrv.conf diff --git a/internal/wisski/ingredient/barrel/barrel/apache.d/sites-available/wisski.conf b/internal/wisski/ingredient/barrel/barrel/barrel/apache.d/sites-available/wisski.conf similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/apache.d/sites-available/wisski.conf rename to internal/wisski/ingredient/barrel/barrel/barrel/apache.d/sites-available/wisski.conf diff --git a/internal/wisski/ingredient/barrel/barrel/php.ini.d/opcache-devel.ini b/internal/wisski/ingredient/barrel/barrel/barrel/php.ini.d/opcache-devel.ini similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/php.ini.d/opcache-devel.ini rename to internal/wisski/ingredient/barrel/barrel/barrel/php.ini.d/opcache-devel.ini diff --git a/internal/wisski/ingredient/barrel/barrel/php.ini.d/opcache-prod.ini b/internal/wisski/ingredient/barrel/barrel/barrel/php.ini.d/opcache-prod.ini similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/php.ini.d/opcache-prod.ini rename to internal/wisski/ingredient/barrel/barrel/barrel/php.ini.d/opcache-prod.ini diff --git a/internal/wisski/ingredient/barrel/barrel/php.ini.d/wisski.ini b/internal/wisski/ingredient/barrel/barrel/barrel/php.ini.d/wisski.ini similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/php.ini.d/wisski.ini rename to internal/wisski/ingredient/barrel/barrel/barrel/php.ini.d/wisski.ini diff --git a/internal/wisski/ingredient/barrel/barrel/scripts/entrypoint.sh b/internal/wisski/ingredient/barrel/barrel/barrel/scripts/entrypoint.sh similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/scripts/entrypoint.sh rename to internal/wisski/ingredient/barrel/barrel/barrel/scripts/entrypoint.sh diff --git a/internal/wisski/ingredient/barrel/barrel/scripts/user_shell.sh b/internal/wisski/ingredient/barrel/barrel/barrel/scripts/user_shell.sh similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/scripts/user_shell.sh rename to internal/wisski/ingredient/barrel/barrel/barrel/scripts/user_shell.sh diff --git a/internal/wisski/ingredient/barrel/barrel/ssh/keys.sh b/internal/wisski/ingredient/barrel/barrel/barrel/ssh/keys.sh similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/ssh/keys.sh rename to internal/wisski/ingredient/barrel/barrel/barrel/ssh/keys.sh diff --git a/internal/wisski/ingredient/barrel/barrel/ssh/sshd_config b/internal/wisski/ingredient/barrel/barrel/barrel/ssh/sshd_config similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/ssh/sshd_config rename to internal/wisski/ingredient/barrel/barrel/barrel/ssh/sshd_config diff --git a/internal/wisski/ingredient/barrel/barrel/ssh/start.sh b/internal/wisski/ingredient/barrel/barrel/barrel/ssh/start.sh similarity index 100% rename from internal/wisski/ingredient/barrel/barrel/ssh/start.sh rename to internal/wisski/ingredient/barrel/barrel/barrel/ssh/start.sh diff --git a/internal/wisski/ingredient/barrel/barrel/docker-compose.yml b/internal/wisski/ingredient/barrel/barrel/docker-compose.yml index 8fde326..1139525 100644 --- a/internal/wisski/ingredient/barrel/barrel/docker-compose.yml +++ b/internal/wisski/ingredient/barrel/barrel/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: barrel: build: - context: . + context: barrel args: BARREL_BASE_IMAGE: ${BARREL_BASE_IMAGE} OPCACHE_MODE: ${OPCACHE_MODE}