! Merge branch 'dev'

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,5 @@ VOLUME [ "/app/Backend/database/sqlite" ]
 # define the exposed port
 EXPOSE 9000
 
-# start the app
+# setting entrypoint
-CMD ["/usr/bin/supervisord"]
+ENTRYPOINT ["/usr/bin/supervisord"]

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 == dev ]] && tag=testing
-#[[ $branch == master ]] && tag=latest
+[[ $branch == main ]] && tag=latest
-#[[ $branch == features/nginx-server ]] && tag=nginx-joint
+[[ $branch == master ]] && tag=latest
 
 # ---------------------------------------------------------------------------
 echo Building image...
 
-docker build \
+docker build . \
     --tag ${PACKAGE_REPOSITORY}:$tag \
-    --build-arg GROUP_ID=$(id -g) \
+    --build-arg GROUP_ID=${GID} \
-    --build-arg USER_ID=$(id -u) \
+    --build-arg USER_ID=${UID} \
     --file build/${BUILD_TAG}/Dockerfile \
-    .
+    --platform linux/amd64,linux/arm64 \
-#    --progress=plain \
+    --provenance=false \
+    --sbom=false \
 #    --push \
 
 # ---------------------------------------------------------------------------

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)