From 11b6afbe0944c574750eb9abebd3bdcde3afbf52 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 29 May 2024 08:44:57 +0200 Subject: [PATCH] chore: rename docker dirs --- .github/workflows/development-build.yml | 4 ++-- .github/workflows/production-build.yml | 4 ++-- docker-compose.dev.yml | 2 +- docker/{dev-ssu => dev}/Dockerfile | 4 ++-- .../etc/s6-overlay/s6-rc.d/horizon/dependencies.d/init-setup | 0 docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/horizon/run | 0 docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/horizon/type | 0 .../{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/init-setup/type | 0 docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/init-setup/up | 0 .../s6-rc.d/scheduler-worker/dependencies.d/init-setup | 0 .../etc/s6-overlay/s6-rc.d/scheduler-worker/run | 0 .../etc/s6-overlay/s6-rc.d/scheduler-worker/type | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/horizon | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/init-setup | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker | 0 docker/{dev-ssu => dev}/nginx.conf | 0 docker/{prod-ssu => prod}/Dockerfile | 4 ++-- .../etc/s6-overlay/s6-rc.d/db-migration/type | 0 .../{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/db-migration/up | 0 docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/horizon/run | 0 docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/horizon/type | 0 .../s6-overlay/s6-rc.d/init-script/dependencies.d/init-seeder | 0 .../etc/s6-overlay/s6-rc.d/init-script/type | 0 .../{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-script/up | 0 .../s6-rc.d/init-seeder/dependencies.d/db-migration | 0 .../etc/s6-overlay/s6-rc.d/init-seeder/type | 0 .../{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-seeder/up | 0 .../etc/s6-overlay/s6-rc.d/scheduler-worker/run | 0 .../etc/s6-overlay/s6-rc.d/scheduler-worker/type | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/db-migration | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/horizon | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/init-script | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/init-seeder | 0 .../etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker | 0 docker/{prod-ssu => prod}/nginx.conf | 0 35 files changed, 9 insertions(+), 9 deletions(-) rename docker/{dev-ssu => dev}/Dockerfile (93%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/horizon/dependencies.d/init-setup (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/horizon/run (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/horizon/type (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/init-setup/type (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/init-setup/up (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/scheduler-worker/dependencies.d/init-setup (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/scheduler-worker/run (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/scheduler-worker/type (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/user/contents.d/horizon (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup (100%) rename docker/{dev-ssu => dev}/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker (100%) rename docker/{dev-ssu => dev}/nginx.conf (100%) rename docker/{prod-ssu => prod}/Dockerfile (95%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/db-migration/type (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/db-migration/up (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/horizon/run (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/horizon/type (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-script/dependencies.d/init-seeder (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-script/type (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-script/up (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-seeder/dependencies.d/db-migration (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-seeder/type (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/init-seeder/up (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/scheduler-worker/run (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/scheduler-worker/type (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/user/contents.d/db-migration (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/user/contents.d/horizon (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/user/contents.d/init-script (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/user/contents.d/init-seeder (100%) rename docker/{prod-ssu => prod}/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker (100%) rename docker/{prod-ssu => prod}/nginx.conf (100%) diff --git a/.github/workflows/development-build.yml b/.github/workflows/development-build.yml index d64af3b59..268b885ac 100644 --- a/.github/workflows/development-build.yml +++ b/.github/workflows/development-build.yml @@ -26,7 +26,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: docker/prod-ssu/Dockerfile + file: docker/prod/Dockerfile platforms: linux/amd64 push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }} @@ -47,7 +47,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: docker/prod-ssu/Dockerfile + file: docker/prod/Dockerfile platforms: linux/aarch64 push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml index 3709b5b46..e4bad6a65 100644 --- a/.github/workflows/production-build.yml +++ b/.github/workflows/production-build.yml @@ -29,7 +29,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: docker/prod-ssu/Dockerfile + file: docker/prod/Dockerfile platforms: linux/amd64 push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }} @@ -51,7 +51,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: docker/prod-ssu/Dockerfile + file: docker/prod/Dockerfile platforms: linux/aarch64 push: true tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}-aarch64 diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 91e90b989..7eda14d41 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -2,7 +2,7 @@ services: coolify: build: context: . - dockerfile: ./docker/dev-ssu/Dockerfile + dockerfile: ./docker/dev/Dockerfile ports: - "${APP_PORT:-8000}:80" environment: diff --git a/docker/dev-ssu/Dockerfile b/docker/dev/Dockerfile similarity index 93% rename from docker/dev-ssu/Dockerfile rename to docker/dev/Dockerfile index f0e353d28..f75a0ff1e 100644 --- a/docker/dev-ssu/Dockerfile +++ b/docker/dev/Dockerfile @@ -18,9 +18,9 @@ RUN apt-get install postgresql-client-$POSTGRES_VERSION -y # Coolify requirements RUN apt-get install -y php8.2-pgsql openssh-client git git-lfs jq lsof RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -COPY --chmod=755 docker/dev-ssu/etc/s6-overlay/ /etc/s6-overlay/ +COPY --chmod=755 docker/dev/etc/s6-overlay/ /etc/s6-overlay/ -COPY docker/dev-ssu/nginx.conf /etc/nginx/conf.d/custom.conf +COPY docker/dev/nginx.conf /etc/nginx/conf.d/custom.conf RUN echo "alias ll='ls -al'" >>/etc/bash.bashrc RUN echo "alias a='php artisan'" >>/etc/bash.bashrc diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/horizon/dependencies.d/init-setup b/docker/dev/etc/s6-overlay/s6-rc.d/horizon/dependencies.d/init-setup similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/horizon/dependencies.d/init-setup rename to docker/dev/etc/s6-overlay/s6-rc.d/horizon/dependencies.d/init-setup diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/horizon/run b/docker/dev/etc/s6-overlay/s6-rc.d/horizon/run similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/horizon/run rename to docker/dev/etc/s6-overlay/s6-rc.d/horizon/run diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/horizon/type b/docker/dev/etc/s6-overlay/s6-rc.d/horizon/type similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/horizon/type rename to docker/dev/etc/s6-overlay/s6-rc.d/horizon/type diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/init-setup/type b/docker/dev/etc/s6-overlay/s6-rc.d/init-setup/type similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/init-setup/type rename to docker/dev/etc/s6-overlay/s6-rc.d/init-setup/type diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/init-setup/up b/docker/dev/etc/s6-overlay/s6-rc.d/init-setup/up similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/init-setup/up rename to docker/dev/etc/s6-overlay/s6-rc.d/init-setup/up diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/dependencies.d/init-setup b/docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/dependencies.d/init-setup similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/dependencies.d/init-setup rename to docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/dependencies.d/init-setup diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/run b/docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/run rename to docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/run diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/type b/docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/type similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/type rename to docker/dev/etc/s6-overlay/s6-rc.d/scheduler-worker/type diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/horizon b/docker/dev/etc/s6-overlay/s6-rc.d/user/contents.d/horizon similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/horizon rename to docker/dev/etc/s6-overlay/s6-rc.d/user/contents.d/horizon diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup b/docker/dev/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup rename to docker/dev/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup diff --git a/docker/dev-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker b/docker/dev/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker similarity index 100% rename from docker/dev-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker rename to docker/dev/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker diff --git a/docker/dev-ssu/nginx.conf b/docker/dev/nginx.conf similarity index 100% rename from docker/dev-ssu/nginx.conf rename to docker/dev/nginx.conf diff --git a/docker/prod-ssu/Dockerfile b/docker/prod/Dockerfile similarity index 95% rename from docker/prod-ssu/Dockerfile rename to docker/prod/Dockerfile index 2192f4f0e..500c098ef 100644 --- a/docker/prod-ssu/Dockerfile +++ b/docker/prod/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get install postgresql-client-$POSTGRES_VERSION -y RUN apt-get install -y php8.2-pgsql openssh-client git git-lfs jq lsof RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* -COPY docker/prod-ssu/nginx.conf /etc/nginx/conf.d/custom.conf +COPY docker/prod/nginx.conf /etc/nginx/conf.d/custom.conf COPY --from=base --chown=9999:9999 /var/www/html . @@ -42,7 +42,7 @@ COPY --chown=9999:9999 . . RUN composer dump-autoload COPY --from=static-assets --chown=9999:9999 /app/public/build ./public/build -COPY --chmod=755 docker/prod-ssu/etc/s6-overlay/ /etc/s6-overlay/ +COPY --chmod=755 docker/prod/etc/s6-overlay/ /etc/s6-overlay/ RUN php artisan route:cache RUN php artisan view:cache diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/type b/docker/prod/etc/s6-overlay/s6-rc.d/db-migration/type similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/type rename to docker/prod/etc/s6-overlay/s6-rc.d/db-migration/type diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up b/docker/prod/etc/s6-overlay/s6-rc.d/db-migration/up similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/db-migration/up rename to docker/prod/etc/s6-overlay/s6-rc.d/db-migration/up diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/horizon/run b/docker/prod/etc/s6-overlay/s6-rc.d/horizon/run similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/horizon/run rename to docker/prod/etc/s6-overlay/s6-rc.d/horizon/run diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/horizon/type b/docker/prod/etc/s6-overlay/s6-rc.d/horizon/type similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/horizon/type rename to docker/prod/etc/s6-overlay/s6-rc.d/horizon/type diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/dependencies.d/init-seeder b/docker/prod/etc/s6-overlay/s6-rc.d/init-script/dependencies.d/init-seeder similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/dependencies.d/init-seeder rename to docker/prod/etc/s6-overlay/s6-rc.d/init-script/dependencies.d/init-seeder diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/type b/docker/prod/etc/s6-overlay/s6-rc.d/init-script/type similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/type rename to docker/prod/etc/s6-overlay/s6-rc.d/init-script/type diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up b/docker/prod/etc/s6-overlay/s6-rc.d/init-script/up similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-script/up rename to docker/prod/etc/s6-overlay/s6-rc.d/init-script/up diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-seeder/dependencies.d/db-migration b/docker/prod/etc/s6-overlay/s6-rc.d/init-seeder/dependencies.d/db-migration similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-seeder/dependencies.d/db-migration rename to docker/prod/etc/s6-overlay/s6-rc.d/init-seeder/dependencies.d/db-migration diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-seeder/type b/docker/prod/etc/s6-overlay/s6-rc.d/init-seeder/type similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-seeder/type rename to docker/prod/etc/s6-overlay/s6-rc.d/init-seeder/type diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-seeder/up b/docker/prod/etc/s6-overlay/s6-rc.d/init-seeder/up similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/init-seeder/up rename to docker/prod/etc/s6-overlay/s6-rc.d/init-seeder/up diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/run b/docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/run rename to docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/run diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/type b/docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/type similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/scheduler-worker/type rename to docker/prod/etc/s6-overlay/s6-rc.d/scheduler-worker/type diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/db-migration b/docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/db-migration similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/db-migration rename to docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/db-migration diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/horizon b/docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/horizon similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/horizon rename to docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/horizon diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-script b/docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/init-script similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-script rename to docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/init-script diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-seeder b/docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/init-seeder similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/init-seeder rename to docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/init-seeder diff --git a/docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker b/docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker similarity index 100% rename from docker/prod-ssu/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker rename to docker/prod/etc/s6-overlay/s6-rc.d/user/contents.d/scheduler-worker diff --git a/docker/prod-ssu/nginx.conf b/docker/prod/nginx.conf similarity index 100% rename from docker/prod-ssu/nginx.conf rename to docker/prod/nginx.conf