Update dir and user names used in Docker

Author: mythz

Dockerfile

@@ -3,6 +3,7 @@
 # Build arguments
 ARG KAMAL_DEPLOY_HOST
 ARG SERVICESTACK_LICENSE
+ARG APP_PASSWORD
 ARG SERVICE_LABEL
 
 # 1. Build .NET app + Node.js apps
@@ -30,9 +31,9 @@ COPY MyApp.ServiceModel ./MyApp.ServiceModel
 WORKDIR /src/MyApp
 
 # Download tailwindcss binary directly (avoiding sudo requirement in postinstall.js)
-RUN curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 \
-    && chmod +x tailwindcss-linux-x64 \
-    && mv tailwindcss-linux-x64 /usr/local/bin/tailwindcss
+RUN curl -sL https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64 \
+    -o /usr/local/bin/tailwindcss \
+    && chmod +x /usr/local/bin/tailwindcss
 RUN npm run ui:build
 
 # Build Next.js app
@@ -67,18 +68,18 @@ RUN apt-get update \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Create unprivileged user for Node.js
-RUN groupadd -r nodeuser && useradd -r -g nodeuser -s /bin/bash nodeuser
+# Create unprivileged user for Next.js
+RUN groupadd -r nextjs && useradd -r -g nextjs -s /bin/bash nextjs
 
-# Copy published .NET app (owned by root, no access for nodeuser)
-COPY --from=dotnet-build /src/MyApp/bin/Release/net10.0/publish ./api
-RUN chmod -R 700 ./api && chown -R root:root ./api
+# Copy published .NET app (owned by root, no access for nextjs user)
+COPY --from=dotnet-build /src/MyApp/bin/Release/net10.0/publish ./dotnet
+RUN chmod -R 700 ./dotnet && chown -R root:root ./dotnet
 
-# Copy built Next.js app (owned by nodeuser, read-only)
-COPY --from=dotnet-build /src/MyApp.Client ./client
-RUN chown -R nodeuser:nodeuser ./client && chmod -R 500 ./client
+# Copy built Next.js app (owned by nextjs user, read-only)
+COPY --from=dotnet-build /src/MyApp.Client ./nextjs
+RUN chown -R nextjs:nextjs ./nextjs && chmod -R 500 ./nextjs
 
-# Create /tmp directory accessible to nodeuser
+# Create /tmp directory accessible to nextjs user
 RUN mkdir -p /tmp && chmod 1777 /tmp
 
 ENV ASPNETCORE_URLS=http://0.0.0.0:8080 \

entrypoint.sh

@@ -7,29 +7,29 @@ NEXT_PORT="${NEXT_PORT:-3000}"
 # If running an AppTask (e.g. --AppTasks=migrate), run only the .NET app and exit
 if [[ "$*" == *"--AppTasks"* ]]; then
   echo "Running AppTask with args: $*"
-  ASPNETCORE_CONTENTROOT="/app/api" ASPNETCORE_URLS="${ASPNETCORE_URLS}" \
-    dotnet /app/api/MyApp.dll "$@"
+  ASPNETCORE_CONTENTROOT="/app/dotnet" ASPNETCORE_URLS="${ASPNETCORE_URLS}" \
+    dotnet /app/dotnet/MyApp.dll "$@"
   exit $?
 fi
 
 echo "Starting ASP.NET Core on ${ASPNETCORE_URLS}..."
 
 # Start ASP.NET Core application as root with full environment
-ASPNETCORE_CONTENTROOT="/app/api" ASPNETCORE_URLS="${ASPNETCORE_URLS}" dotnet /app/api/MyApp.dll &
+ASPNETCORE_CONTENTROOT="/app/dotnet" ASPNETCORE_URLS="${ASPNETCORE_URLS}" dotnet /app/dotnet/MyApp.dll &
 DOTNET_PID=$!
 
 echo "Starting Next.js on port ${NEXT_PORT} as isolated user..."
 
 # Start Node.js with minimal environment and as unprivileged user
 # Only pass through safe environment variables
-cd /app/client && su nodeuser -s /bin/bash -c "
+cd /app/nextjs && su nextjs -s /bin/bash -c "
 export HOME=/tmp
 export NODE_ENV=production
 export NEXT_PORT=${NEXT_PORT}
 export INTERNAL_API_URL=${INTERNAL_API_URL:-http://127.0.0.1:8080}
 export KAMAL_DEPLOY_HOST=${KAMAL_DEPLOY_HOST}
 export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-cd /app/client
+cd /app/nextjs
 npm run start -- --port ${NEXT_PORT}
 " &
 NEXT_PID=$!