From 965d30bd03b14280f65bd201cf7ebaae98c1c3ac Mon Sep 17 00:00:00 2001 From: = Date: Sat, 4 Jan 2025 22:32:34 +0530 Subject: [PATCH] feat: updated docker --- Dockerfile.fips.standalone-infisical | 13 +++---------- Dockerfile.standalone-infisical | 16 +++------------- docker-compose.dev.yml | 3 --- 3 files changed, 6 insertions(+), 26 deletions(-) diff --git a/Dockerfile.fips.standalone-infisical b/Dockerfile.fips.standalone-infisical index 75e95eae8f..753fe301b5 100644 --- a/Dockerfile.fips.standalone-infisical +++ b/Dockerfile.fips.standalone-infisical @@ -8,7 +8,7 @@ FROM node:20-slim AS base FROM base AS frontend-dependencies WORKDIR /app -COPY frontend/package.json frontend/package-lock.json frontend/next.config.js ./ +COPY frontend/package.json frontend/package-lock.json ./ # Install dependencies RUN npm ci --only-production --ignore-scripts @@ -23,7 +23,6 @@ COPY --from=frontend-dependencies /app/node_modules ./node_modules COPY /frontend . ENV NODE_ENV production -ENV NEXT_PUBLIC_ENV production ARG POSTHOG_HOST ENV NEXT_PUBLIC_POSTHOG_HOST $POSTHOG_HOST ARG POSTHOG_API_KEY @@ -44,20 +43,14 @@ WORKDIR /app RUN groupadd -r -g 1001 nodejs && useradd -r -u 1001 -g nodejs non-root-user -RUN mkdir -p /app/.next/cache/images && chown non-root-user:nodejs /app/.next/cache/images -VOLUME /app/.next/cache/images - COPY --chown=non-root-user:nodejs --chmod=555 frontend/scripts ./scripts -COPY --from=frontend-builder /app/public ./public -RUN chown non-root-user:nodejs ./public/data +COPY --from=frontend-builder --chown=non-root-user:nodejs /app/dist ./ COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/standalone ./ COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/static ./.next/static USER non-root-user -ENV NEXT_TELEMETRY_DISABLED 1 - ## ## BACKEND ## @@ -192,4 +185,4 @@ EXPOSE 443 USER non-root-user -CMD ["./standalone-entrypoint.sh"] \ No newline at end of file +CMD ["./standalone-entrypoint.sh"] diff --git a/Dockerfile.standalone-infisical b/Dockerfile.standalone-infisical index 98370b2a82..b4e42679db 100644 --- a/Dockerfile.standalone-infisical +++ b/Dockerfile.standalone-infisical @@ -12,7 +12,7 @@ RUN apk add --no-cache libc6-compat WORKDIR /app -COPY frontend/package.json frontend/package-lock.json frontend/next.config.js ./ +COPY frontend/package.json frontend/package-lock.json ./ # Install dependencies RUN npm ci --only-production --ignore-scripts @@ -27,7 +27,6 @@ COPY --from=frontend-dependencies /app/node_modules ./node_modules COPY /frontend . ENV NODE_ENV production -ENV NEXT_PUBLIC_ENV production ARG POSTHOG_HOST ENV NEXT_PUBLIC_POSTHOG_HOST $POSTHOG_HOST ARG POSTHOG_API_KEY @@ -49,20 +48,11 @@ WORKDIR /app RUN addgroup --system --gid 1001 nodejs RUN adduser --system --uid 1001 non-root-user -RUN mkdir -p /app/.next/cache/images && chown non-root-user:nodejs /app/.next/cache/images -VOLUME /app/.next/cache/images - COPY --chown=non-root-user:nodejs --chmod=555 frontend/scripts ./scripts -COPY --from=frontend-builder /app/public ./public -RUN chown non-root-user:nodejs ./public/data - -COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/standalone ./ -COPY --from=frontend-builder --chown=non-root-user:nodejs /app/.next/static ./.next/static +COPY --from=frontend-builder --chown=non-root-user:nodejs /app/dist ./ USER non-root-user -ENV NEXT_TELEMETRY_DISABLED 1 - ## ## BACKEND ## @@ -189,4 +179,4 @@ EXPOSE 443 USER non-root-user -CMD ["./standalone-entrypoint.sh"] \ No newline at end of file +CMD ["./standalone-entrypoint.sh"] diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9e1c220d4f..a9ff7e0910 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -144,9 +144,6 @@ services: - ./frontend/src:/app/src/ # mounted whole src to avoid missing reload on new files - ./frontend/public:/app/public env_file: .env - environment: - - NEXT_PUBLIC_ENV=development - - INFISICAL_TELEMETRY_ENABLED=false pgadmin: image: dpage/pgadmin4