From 2c5813fa3ad9f59c6e639ca1cda01a8c834a7aa0 Mon Sep 17 00:00:00 2001 From: valere Date: Wed, 23 Aug 2023 13:28:47 +0200 Subject: [PATCH] FIX: name pegazdev not .dev --- Dockerfile | 11 ++++------- package-lock.json | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 12945cf..a509f27 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,19 +7,17 @@ WORKDIR /app COPY package.json . COPY package-lock.json . -COPY .env . +COPY config.sh . RUN npm ci # 2 - CONFIGURE FROM install AS configure COPY . . -COPY .env . +COPY config.sh . -RUN sed -i "s|sqlite|postgresql|g" prisma/schema.prisma -RUN source .env && sed -i "s|DATABASE_URL=.*|DATABASE_URL=postgresql://$NAME_DB:$PASSWORD_DB@evilspins-db/$NAME_DB?schema=public|g" .env # avoid conflict with nuxt build: -RUN sed -i "s|PORT=.*||g" .env +RUN sed -i "s|PORT=.*||g" config.sh RUN npm run build @@ -30,11 +28,10 @@ WORKDIR /app COPY --from=install /app/node_modules /app/node_modules COPY --from=configure /app /app -RUN cp /app/.env /app/.output/server/ ENV NUXT_HOST=0.0.0.0 ARG NUXT_APP_VERSION ENV NUXT_APP_VERSION=${NUXT_APP_VERSION} ENV NODE_ENV=production -CMD source .env && npx prisma db push && node .output/server/index.mjs +CMD source config.sh && npx prisma db push && node .output/server/index.mjs diff --git a/package-lock.json b/package-lock.json index a6f65ef..1d06816 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "pegaz.dev", + "name": "pegazdev", "lockfileVersion": 2, "requires": true, "packages": {