diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 7924f72a..c148883b 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -3,11 +3,11 @@ name: portabase-prod services: app: - # build: - # context: . - # dockerfile: docker/dockerfile/Dockerfile - # target: prod - image: solucetechnologies/portabase:1.1.3-rc.3 + build: + context: . + dockerfile: docker/dockerfile/Dockerfile + target: prod +# image: solucetechnologies/portabase:1.1.4-rc.1 ports: - '8887:80' environment: diff --git a/docker/dockerfile/Dockerfile b/docker/dockerfile/Dockerfile index 9103e889..be8ba29a 100644 --- a/docker/dockerfile/Dockerfile +++ b/docker/dockerfile/Dockerfile @@ -110,3 +110,4 @@ USER nextjs ENTRYPOINT ["sh","/app/app-prod-entrypoint.sh"] + diff --git a/docker/entrypoints/app-prod-entrypoint.sh b/docker/entrypoints/app-prod-entrypoint.sh index 23e73a04..94000992 100644 --- a/docker/entrypoints/app-prod-entrypoint.sh +++ b/docker/entrypoints/app-prod-entrypoint.sh @@ -1,15 +1,14 @@ #!/bin/bash if [ -n "$TZ" ]; then - if [ -f "/usr/share/zoneinfo/$TZ" ]; then - ln -sf /usr/share/zoneinfo/$TZ /etc/localtime - echo "$TZ" > /etc/timezone - echo "[INFO] Timezone set to $TZ" - else - echo "[WARN] Timezone '$TZ' not found. Using default." - fi + echo "[INFO] Application timezone set to $TZ (environment only)" + export TZ="$TZ" +else + echo "[WARN] No TZ provided, using default container timezone" fi + node server.js -exec "$@" \ No newline at end of file +exec "$@" + diff --git a/src/components/wrappers/auth/login/login-form/login-form.tsx b/src/components/wrappers/auth/login/login-form/login-form.tsx index d8556243..d6f54e0f 100644 --- a/src/components/wrappers/auth/login/login-form/login-form.tsx +++ b/src/components/wrappers/auth/login/login-form/login-form.tsx @@ -150,11 +150,13 @@ export const LoginForm = (props: loginFormProps) => { -