Skip to content

Commit

Permalink
Merge pull request #10 from flameshikari/dev
Browse files Browse the repository at this point in the history
0.79.0
  • Loading branch information
flameshikari authored Sep 5, 2024
2 parents 7e43e72 + a0e9b33 commit ffca317
Show file tree
Hide file tree
Showing 8 changed files with 90 additions and 76 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dry_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: false
cache-from: type=gha
cache-to: type=gha,mode=max
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
utils/translation.json
scripts/translation.json
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ WORKDIR $APP_PATH
FROM base AS build
COPY ./src/package.json ./src/yarn.lock ./
COPY ./src/patches ./patches
RUN apt-get update && \
apt-get install -y wget && \
rm -rf /var/lib/apt/lists/*
RUN yarn install --no-optional --frozen-lockfile --network-timeout 1000000 && \
yarn cache clean
COPY src .
Expand All @@ -20,7 +17,7 @@ RUN rm -rf node_modules
RUN yarn install --production=true --frozen-lockfile --network-timeout 1000000 && \
yarn cache clean
ENV PORT=3000
HEALTHCHECK CMD wget -qO- http://localhost:${PORT}/_health | grep -q "OK" || exit 1


FROM base AS release
ENV NODE_ENV=production
Expand All @@ -30,6 +27,9 @@ COPY --from=build $APP_PATH/public ./public
COPY --from=build $APP_PATH/.sequelizerc ./.sequelizerc
COPY --from=build $APP_PATH/node_modules ./node_modules
COPY --from=build $APP_PATH/package.json ./package.json
RUN apt-get update && \
apt-get install -y wget && \
rm -rf /var/lib/apt/lists/*
RUN addgroup --gid 1001 nodejs && \
adduser --uid 1001 --ingroup nodejs nodejs && \
chown -R nodejs:nodejs $APP_PATH/build && \
Expand All @@ -41,5 +41,6 @@ RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
chmod 1777 "$FILE_STORAGE_LOCAL_ROOT_DIR"
VOLUME /var/lib/outline/data
USER nodejs
HEALTHCHECK CMD wget -qO- http://localhost:${PORT}/_health | grep -q "OK" || exit 1
EXPOSE 3000
CMD ["yarn", "start"]
File renamed without changes.
2 changes: 2 additions & 0 deletions utils/check_missing_lines.py → scripts/check_missing_lines.py
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/usr/bin/env python

import json
import os

Expand Down
2 changes: 1 addition & 1 deletion utils/insert_ru_entries.sh → scripts/insert_ru_entries.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

CWD="$(cd "$(dirname "${BASH_SOURCE[0]}")"/.. && pwd)"

Expand Down
147 changes: 79 additions & 68 deletions shared/i18n/locales/ru_RU/translation.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src
Submodule src updated 379 files

0 comments on commit ffca317

Please sign in to comment.