diff --git a/.dockerignore b/.dockerignore index 40d5f5bb..533b1ca1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,3 +4,5 @@ Dockerfile .gitignore .DS_Store node_modules +prisma/db +yarn.lock \ No newline at end of file diff --git a/.stylelintrc.json b/.stylelintrc.json deleted file mode 100644 index 117fac2a..00000000 --- a/.stylelintrc.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "extends": [ - "stylelint-config-recommended", - "stylelint-config-css-modules", - "stylelint-config-prettier" - ], - "rules": { - "no-descending-specificity": null, - "selector-pseudo-class-no-unknown": [ - true, - { - "ignorePseudoClasses": ["global", "horizontal", "vertical"] - } - ] - }, - "ignoreFiles": ["**/*.js"] -} diff --git a/Dockerfile b/Dockerfile index 3e0074b9..6d4bebbd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,28 +1,9 @@ FROM node:16.2.0-alpine3.13 AS build WORKDIR /build RUN yarn config set --home enableTelemetry 0 -COPY package.json yarn.lock /build/ -RUN yarn --production --frozen-lockfile -# Cache these modules for production -RUN cp -R node_modules/ prod_node_modules/ -# Install development dependencies -RUN yarn --frozen-lockfile +COPY package.json /build/ +RUN yarn COPY . /build -RUN yarn next telemetry disable RUN yarn build - -# Production image -FROM node:16.2.0-alpine3.13 AS production -WORKDIR /app - -# Copy cached dependencies -COPY --from=build /build/prod_node_modules ./node_modules - -# Copy generated Prisma client -COPY --from=build /build/node_modules/.prisma/ ./node_modules/.prisma/ - -COPY --from=build /build/yarn.lock /build/package.json ./ -COPY --from=build /build/.next ./.next -COPY --from=build /build/public ./public - +RUN yarn prisma migrate dev CMD ["yarn", "start"] diff --git a/docker-compose.yml b/docker-compose.yml index 79adae2d..ddde8885 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,5 +6,5 @@ services: - 50001:3000 environment: HASH_SALT: xSSHW4A2w0e3vxLUp46XL9OzCGKvxEnA - volumes: - - ./db:/app/prisma/db \ No newline at end of file + # volumes: + # - ./db:/app/prisma/db \ No newline at end of file diff --git a/lang-ignore.json b/lang-ignore.json deleted file mode 100644 index 8a01beb9..00000000 --- a/lang-ignore.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "cs-CZ": ["label.reset", "metrics.device.tablet"], - "de-DE": [ - "label.administrator", - "label.name", - "label.domain", - "metrics.device.desktop", - "metrics.device.laptop", - "metrics.device.tablet", - "metrics.referrers" - ], - "fr-FR": ["metrics.actions", "metrics.pages"], - "nb-NO": ["label.administrator", "label.dashboard"], - "nl-NL": [ - "label.administrator", - "label.websites", - "metrics.browsers", - "metrics.device.desktop", - "metrics.device.laptop", - "metrics.device.tablet" - ] -}