Fix docker-compose: use local registry, named volumes, run as root
This commit is contained in:
13
Dockerfile
13
Dockerfile
@@ -34,6 +34,9 @@ RUN adduser --system --uid 1001 nextjs
|
|||||||
# Copy necessary files
|
# Copy necessary files
|
||||||
COPY --from=builder /app/public ./public
|
COPY --from=builder /app/public ./public
|
||||||
COPY --from=builder /app/prisma ./prisma
|
COPY --from=builder /app/prisma ./prisma
|
||||||
|
COPY --from=builder /app/prisma.config.ts ./prisma.config.ts
|
||||||
|
COPY --from=builder /app/node_modules ./node_modules
|
||||||
|
COPY --from=builder /app/package.json ./package.json
|
||||||
|
|
||||||
# Set the correct permission for prerender cache
|
# Set the correct permission for prerender cache
|
||||||
RUN mkdir .next
|
RUN mkdir .next
|
||||||
@@ -43,9 +46,13 @@ RUN chown nextjs:nodejs .next
|
|||||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
|
||||||
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
|
||||||
|
|
||||||
|
# Copy entrypoint script
|
||||||
|
COPY --chown=nextjs:nodejs docker-entrypoint.sh ./
|
||||||
|
RUN chmod +x docker-entrypoint.sh
|
||||||
|
|
||||||
# Create upload and data directories
|
# Create upload and data directories
|
||||||
RUN mkdir -p uploads data
|
RUN mkdir -p uploads data
|
||||||
RUN chown -R nextjs:nodejs uploads data
|
RUN chown -R nextjs:nodejs uploads data prisma
|
||||||
|
|
||||||
USER nextjs
|
USER nextjs
|
||||||
|
|
||||||
@@ -54,4 +61,6 @@ EXPOSE 3000
|
|||||||
ENV PORT=3000
|
ENV PORT=3000
|
||||||
ENV HOSTNAME="0.0.0.0"
|
ENV HOSTNAME="0.0.0.0"
|
||||||
|
|
||||||
CMD ["node", "server.js"]
|
CMD ["./docker-entrypoint.sh"]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,9 @@
|
|||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: gitea.krfcm.pl/krfcm/sitemap-builder:latest
|
image: 10.255.255.2:3000/krfcm/sitemap-builder:latest
|
||||||
container_name: sitemap-builder
|
container_name: sitemap-builder
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
user: "0:0" # Run as root to avoid permission issues
|
||||||
ports:
|
ports:
|
||||||
- "3050:3000"
|
- "3050:3000"
|
||||||
environment:
|
environment:
|
||||||
@@ -12,7 +13,12 @@ services:
|
|||||||
- UPLOAD_DIR=/app/uploads
|
- UPLOAD_DIR=/app/uploads
|
||||||
volumes:
|
volumes:
|
||||||
# Persist SQLite database
|
# Persist SQLite database
|
||||||
- ./data:/app/data
|
- sitemap_data:/app/data
|
||||||
# Persist uploaded files
|
# Persist uploaded files
|
||||||
- ./uploads:/app/uploads
|
- sitemap_uploads:/app/uploads
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
sitemap_data:
|
||||||
|
sitemap_uploads:
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
18
docker-entrypoint.sh
Normal file
18
docker-entrypoint.sh
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Ensure data directory exists and is writable
|
||||||
|
echo "Checking data directory..."
|
||||||
|
mkdir -p /app/data
|
||||||
|
touch /app/data/database.db 2>/dev/null || true
|
||||||
|
|
||||||
|
# Run Prisma migrations to create/update database
|
||||||
|
echo "Running Prisma migrations..."
|
||||||
|
npx prisma migrate deploy || {
|
||||||
|
echo "Migration failed, trying db push..."
|
||||||
|
npx prisma db push --accept-data-loss
|
||||||
|
}
|
||||||
|
|
||||||
|
# Start the application
|
||||||
|
echo "Starting Next.js server..."
|
||||||
|
exec node server.js
|
||||||
Reference in New Issue
Block a user