From 327fa9925b48ec2183a58b5362b25f430478b97c Mon Sep 17 00:00:00 2001 From: mike Date: Sat, 11 Jun 2022 02:27:42 -0700 Subject: [PATCH 1/4] Added missing args. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4a76c711..84752e17 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,8 @@ RUN yarn install --frozen-lockfile # Rebuild the source code only when needed FROM node:16-alpine AS builder +ARG BASE_PATH +ARG DATABASE_TYPE ENV BASE_PATH=$BASE_PATH ENV DATABASE_URL "postgresql://umami:umami@db:5432/umami" ENV DATABASE_TYPE=$DATABASE_TYPE @@ -38,7 +40,7 @@ COPY --from=builder /app/next.config.js ./ COPY --from=builder /app/public ./public COPY --from=builder /app/package.json ./package.json -# Automatically leverage output traces to reduce image size +# Automatically leverage output traces to reduce image size # https://nextjs.org/docs/advanced-features/output-file-tracing COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./ COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static From 692a5d5e926029dc2b954a9f4b272a09bb2bdcbd Mon Sep 17 00:00:00 2001 From: mike Date: Sat, 11 Jun 2022 02:36:45 -0700 Subject: [PATCH 2/4] Update github action. --- .github/workflows/cd.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index cb8f3e59..b7fd3f8c 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,6 +1,9 @@ name: Create docker images -on: [create] +on: + push: + branches: + - master jobs: @@ -27,4 +30,4 @@ jobs: buildArgs: DATABASE_TYPE=${{ matrix.db-type }} registry: ghcr.io/${{ github.actor }} username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + password: ${{ secrets.GITHUB_TOKEN }} From 0f32f48c24f442ffec715d180adf7736ae037136 Mon Sep 17 00:00:00 2001 From: mike Date: Sat, 11 Jun 2022 02:50:06 -0700 Subject: [PATCH 3/4] Revert github action change. --- .github/workflows/cd.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index b7fd3f8c..807e0fd6 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -1,9 +1,6 @@ name: Create docker images -on: - push: - branches: - - master +on: [create] jobs: From c2dad60607924aed1f271ba234763a4399b6d03b Mon Sep 17 00:00:00 2001 From: Bilguun Ochirbat Date: Mon, 13 Jun 2022 11:11:28 +0800 Subject: [PATCH 4/4] Updated mn-MN.json --- lang/mn-MN.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lang/mn-MN.json b/lang/mn-MN.json index ca071e2f..f00beffc 100644 --- a/lang/mn-MN.json +++ b/lang/mn-MN.json @@ -5,7 +5,7 @@ "label.administrator": "Админ", "label.all": "Бүх", "label.all-events": "Бүх үйл явдал", - "label.all-time": "All time", + "label.all-time": "Бүх цаг үеийн", "label.all-websites": "Бүх вебүүд", "label.back": "Буцах", "label.cancel": "Цуцлах", @@ -28,7 +28,7 @@ "label.enable-share-url": "Хуваалцах холбоос идэвхжүүлэх", "label.invalid": "Буруу", "label.invalid-domain": "Буруу домэйн", - "label.language": "Language", + "label.language": "Хэл", "label.last-days": "Сүүлийн {x} хоног", "label.last-hours": "Сүүлийн {x} цаг", "label.logged-in-as": "{username}-р нэвтэрсэн", @@ -37,7 +37,7 @@ "label.more": "Цааш", "label.name": "Нэр", "label.new-password": "Шинэ нууц үг", - "label.owner": "Owner", + "label.owner": "Эзэмшигч", "label.password": "Нууц үг", "label.passwords-dont-match": "Нууц үг тохирохгүй байна", "label.profile": "Бүртгэл", @@ -46,12 +46,12 @@ "label.refresh": "Сэргээх", "label.required": "Шаардлагатай", "label.reset": "Хуучин хэвд нь оруулах", - "label.reset-website": "Reset statistics", + "label.reset-website": "Тоон үзүүлэлтийг дахин эхлүүлэх", "label.save": "Хадгалах", "label.settings": "Тохиргоо", "label.share-url": "Хуваалцах холбоос", "label.single-day": "Нэг өдөр", - "label.theme": "Theme", + "label.theme": "Загвар", "label.this-month": "Энэ сар", "label.this-week": "Энэ долоо хоног", "label.this-year": "Энэ жил", @@ -78,10 +78,10 @@ "message.no-websites-configured": "Та ямар нэгэн веб тохируулаагүй байна.", "message.page-not-found": "Хуудас олдсонгүй.", "message.powered-by": "{name} дээр суурилсан", - "message.reset-warning": "All statistics for this website will be deleted, but your tracking code will remain intact.", + "message.reset-warning": "Энэ вебийн бүх тоон үзүүлэлтүүдийг устгах болно. Гэхдээ мөрдөх код хэвэндээ үлдэнэ.", "message.save-success": "Амжилттай хадгаллаа.", "message.share-url": "{target}-г нийтэд хуваалцах холбоос.", - "message.toggle-charts": "Toggle charts", + "message.toggle-charts": "Графикийг харуулах/нуух", "message.track-stats": "{target} вебийн статистикийг бүртгэхийн тулд доорх кодыг вебийнхээ {head} хэсэгт байрлуулна уу.", "message.type-delete": "Доорх хэсэгт {delete} гэж бичиж баталгаажуулна уу.", "message.type-reset": "Доорх хэсэгт {reset} гэж бичиж баталгаажуулна уу.", @@ -99,7 +99,7 @@ "metrics.filter.combined": "Нэгтгэсэн", "metrics.filter.domain-only": "Зөвхөн домэйн", "metrics.filter.raw": "Түүхий", - "metrics.languages": "Languages", + "metrics.languages": "Хэл", "metrics.operating-systems": "Үйлдлийн систем", "metrics.page-views": "Хуудас үзсэн", "metrics.pages": "Хуудас",