mirror of
https://github.com/kremalicious/umami.git
synced 2024-12-18 15:23:38 +01:00
Merge branch 'master' into dev
This commit is contained in:
commit
8826baf5b5
@ -5,6 +5,7 @@ ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami" \
|
|||||||
DATABASE_TYPE=$DATABASE_TYPE
|
DATABASE_TYPE=$DATABASE_TYPE
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
|
||||||
|
RUN yarn config set --home enableTelemetry 0
|
||||||
COPY package.json yarn.lock /build/
|
COPY package.json yarn.lock /build/
|
||||||
|
|
||||||
# Install only the production dependencies
|
# Install only the production dependencies
|
||||||
@ -17,6 +18,7 @@ RUN cp -R node_modules/ prod_node_modules/
|
|||||||
RUN yarn install --frozen-lockfile
|
RUN yarn install --frozen-lockfile
|
||||||
|
|
||||||
COPY . /build
|
COPY . /build
|
||||||
|
RUN yarn next telemetry disable
|
||||||
RUN yarn build
|
RUN yarn build
|
||||||
|
|
||||||
# Production image
|
# Production image
|
||||||
|
@ -12,7 +12,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
db:
|
db:
|
||||||
image: postgres:alpine
|
image: postgres:12-alpine
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: umami
|
POSTGRES_DB: umami
|
||||||
POSTGRES_USER: umami
|
POSTGRES_USER: umami
|
||||||
|
@ -75,10 +75,10 @@
|
|||||||
"metrics.events": "Händelser",
|
"metrics.events": "Händelser",
|
||||||
"metrics.filter.combined": "Kombinerade",
|
"metrics.filter.combined": "Kombinerade",
|
||||||
"metrics.filter.domain-only": "Endast domän",
|
"metrics.filter.domain-only": "Endast domän",
|
||||||
"metrics.filter.raw": "Rå",
|
"metrics.filter.raw": "Rådata",
|
||||||
"metrics.operating-systems": "Operativsystem",
|
"metrics.operating-systems": "Operativsystem",
|
||||||
"metrics.page-views": "Sidvisningar",
|
"metrics.page-views": "Sidvisningar",
|
||||||
"metrics.pages": "Sido",
|
"metrics.pages": "Sidor",
|
||||||
"metrics.referrers": "Hänvisare",
|
"metrics.referrers": "Hänvisare",
|
||||||
"metrics.unique-visitors": "Unika besökare",
|
"metrics.unique-visitors": "Unika besökare",
|
||||||
"metrics.views": "Visningar",
|
"metrics.views": "Visningar",
|
||||||
|
Loading…
Reference in New Issue
Block a user