From 0b307b6b5d7978a2974434d808717a341c4d0b17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berg=20J=C3=A1nos?= Date: Sat, 3 May 2025 10:13:07 +0200 Subject: [PATCH 1/5] # Additional documentation. --- build/nginx/Dockerfile | 7 ++++--- build/nginx/build.sh | 29 +++++++++++++++++------------ 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/build/nginx/Dockerfile b/build/nginx/Dockerfile index 9d4b9f7..5713afe 100644 --- a/build/nginx/Dockerfile +++ b/build/nginx/Dockerfile @@ -74,7 +74,7 @@ RUN mkdir -p ${WORKDIR} ${PHP_FPM_LISTEN_DIR} ${LOG_DIR} # change ownership of folders to the user RUN chown -R ${USER_ID}:${GROUP_ID} ${WORKDIR} ${PHP_FPM_LISTEN_DIR} ${LOG_DIR} -# set tue workdir +# set the workdir WORKDIR ${WORKDIR} # copy the application @@ -104,5 +104,6 @@ VOLUME [ "/app/Backend/database/sqlite" ] # define the exposed port EXPOSE 9000 -# start the app -CMD ["/usr/bin/supervisord"] +# setting the command +# CMD ["/usr/bin/supervisord"] +ENTRYPOINT ["/usr/bin/supervisord"] diff --git a/build/nginx/build.sh b/build/nginx/build.sh index 6c6478c..d5e54a5 100755 --- a/build/nginx/build.sh +++ b/build/nginx/build.sh @@ -1,12 +1,16 @@ #!/bin/bash -PACKAGE_REPOSITORY=gitea.goliath.hu/packages/discord-bot-goliath-backend +echo This is a sample build script, if the workflow cannot be used. +echo Please customize the repository address/name for your own. + + +PACKAGE_REPOSITORY=proxima.goliath.hu/proxima/backend BUILD_TAG=nginx -PACKAGE_TAG=nginx +UID=$(id -u) +GID=$(id -g) # --------------------------------------------------------------------------- -echo Building "${BUILD_TAG}" package with "${PACKAGE_TAG}" tag... - +echo Building "${BUILD_TAG}" package .. echo # --------------------------------------------------------------------------- @@ -27,20 +31,21 @@ echo Determining tag name... branch=$(git branch --show-current) tag=${PACKAGE_TAG:-temp} -#[[ $branch == dev ]] && tag=testing -#[[ $branch == master ]] && tag=latest -#[[ $branch == features/nginx-server ]] && tag=nginx-joint +[[ $branch == dev ]] && tag=testing +[[ $branch == main ]] && tag=latest +[[ $branch == master ]] && tag=latest # --------------------------------------------------------------------------- echo Building image... -docker build \ +docker build . \ --tag ${PACKAGE_REPOSITORY}:$tag \ - --build-arg GROUP_ID=$(id -g) \ - --build-arg USER_ID=$(id -u) \ + --build-arg GROUP_ID=${GID} \ + --build-arg USER_ID=${UID} \ --file build/${BUILD_TAG}/Dockerfile \ - . -# --progress=plain \ + --platform linux/amd64,linux/arm64 \ + --provenance=false \ + --sbom=false \ # --push \ # --------------------------------------------------------------------------- From a58e1f23b65a904d9ede141ca469220dd3b05713 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berg=20J=C3=A1nos?= Date: Sat, 3 May 2025 10:22:47 +0200 Subject: [PATCH 2/5] # Typo. --- ...e.php => 2025_04_22_064108_create_telescope_entries_table.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/database/migrations/{2025_06_22_064108_create_telescope_entries_table.php => 2025_04_22_064108_create_telescope_entries_table.php} (100%) diff --git a/src/database/migrations/2025_06_22_064108_create_telescope_entries_table.php b/src/database/migrations/2025_04_22_064108_create_telescope_entries_table.php similarity index 100% rename from src/database/migrations/2025_06_22_064108_create_telescope_entries_table.php rename to src/database/migrations/2025_04_22_064108_create_telescope_entries_table.php From d6ae4abc31e4a5c290d1401ea48be79bb98132ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berg=20J=C3=A1nos?= Date: Sat, 3 May 2025 10:25:01 +0200 Subject: [PATCH 3/5] # Added logo. --- src/public/images/logo.svg | 706 +++++++++++++++++++++++++++++++++++++ 1 file changed, 706 insertions(+) create mode 100644 src/public/images/logo.svg diff --git a/src/public/images/logo.svg b/src/public/images/logo.svg new file mode 100644 index 0000000..df0294a --- /dev/null +++ b/src/public/images/logo.svg @@ -0,0 +1,706 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 7b166338a427cd704942ec1b8f426d9cbe335341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berg=20J=C3=A1nos?= Date: Sat, 3 May 2025 10:34:39 +0200 Subject: [PATCH 4/5] # Changed from CMD to ENTRYPOINT. --- build/nginx/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/nginx/Dockerfile b/build/nginx/Dockerfile index 5713afe..f380e6b 100644 --- a/build/nginx/Dockerfile +++ b/build/nginx/Dockerfile @@ -104,6 +104,5 @@ VOLUME [ "/app/Backend/database/sqlite" ] # define the exposed port EXPOSE 9000 -# setting the command -# CMD ["/usr/bin/supervisord"] +# setting entrypoint ENTRYPOINT ["/usr/bin/supervisord"] From 96d6745171a8425caf4c0f83b0bfc9a681fac0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berg=20J=C3=A1nos?= Date: Sat, 3 May 2025 10:37:30 +0200 Subject: [PATCH 5/5] # Changed badge order. --- src/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/README.md b/src/README.md index ee928b7..edf0580 100644 --- a/src/README.md +++ b/src/README.md @@ -1,5 +1,5 @@ -![Docker build](https://proxima.goliath.hu/proxima/backend/actions/workflows/testing.yaml/badge.svg) ![Docker build](https://proxima.goliath.hu/proxima/backend/actions/workflows/latest.yaml/badge.svg) +![Docker build](https://proxima.goliath.hu/proxima/backend/actions/workflows/testing.yaml/badge.svg) ![Proxima Discord bot](../res/logo.svg)