1.7.0 (#32)

* bump version to 1.7.0

* update HMR mode; make a single dev container for every service; etc

* update translations

Author: flameshikari

.env

@@ -1,11 +1,6 @@
-APP_PATH=/opt/outline
-SRC_PATH=./outline
+COMPOSE_PROFILES=dev
 
-ADDRESS=localhost
-PORT_OUTLINE=10240
-PORT_OIDC=10241
-PORT_REDIS=10242
-PORT_POSTGRES=10243
-
-COMMON=outline
-SECRET=deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef
+# PORT=10240
+# PORT_OIDC=10241
+# PORT_VITE=10242
+# SECRET=deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef # openssl rand -hex 32

.github/workflows/build.yml

@@ -9,8 +9,7 @@ on:
       - .github/workflows/**
       - outline/**
       - translation/ru.json
-      - patches/**
-      - Dockerfile.prod
+      - Dockerfile
   workflow_dispatch:
 
 concurrency:
@@ -42,16 +41,16 @@ jobs:
           submodules: recursive
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ github.actor }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GitHub CR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -65,21 +64,20 @@ jobs:
           echo "version=$version" | tee -a $GITHUB_OUTPUT
 
       - name: Set Metadata
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         id: metadata
         with:
           images: |
             ${{ github.repository }}
             ghcr.io/${{ github.repository }}
 
       - name: Build Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         id: build
         with:
           cache-from: type=gha,scope=build-${{ matrix.arch }}
           cache-to: type=gha,mode=max,scope=build-${{ matrix.arch }}
           platforms: linux/${{ matrix.arch }}
-          file: Dockerfile.prod
           build-args: |
             APP_PATH=/opt/outline
             SRC_PATH=./outline
@@ -93,7 +91,7 @@ jobs:
           touch "${{ runner.temp }}/digests/${digest#sha256:}"
 
       - name: Upload Digests
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
         with:
           name: digests-linux-${{ matrix.arch }}
           path: ${{ runner.temp }}/digests/*
@@ -111,30 +109,30 @@ jobs:
       version: ${{ needs.build.outputs.version }}
     steps:
       - name: Download Digests
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: ${{ runner.temp }}/digests
           pattern: digests-*
           merge-multiple: true
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           username: ${{ github.actor }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Login to GitHub CR
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Set Metadata
-        uses: docker/metadata-action@v5
+        uses: docker/metadata-action@v6
         with:
           images: |
             ${{ github.repository }}
@@ -153,7 +151,7 @@ jobs:
             $(printf 'ghcr.io/${{ github.repository }}@sha256:%s ' *)
 
       - name: Create Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         if: ${{ github.ref == 'refs/heads/master' }}
         with:
           name: ${{ env.version }}

Dockerfile

@@ -1,7 +1,10 @@
-FROM node:22.21.0
+ARG APP_PATH=/opt/outline
+ARG SRC_PATH=./outline
+
+FROM node:24.15.0 AS build
+ARG CDN_URL
 ARG APP_PATH
 ARG SRC_PATH
-ARG CDN_URL
 WORKDIR $APP_PATH
 COPY ${SRC_PATH}/package.json ${SRC_PATH}/yarn.lock ${SRC_PATH}/.yarnrc.yml ./
 COPY ${SRC_PATH}/patches ./patches
@@ -10,16 +13,34 @@ RUN corepack enable && \
     yarn install --immutable --network-timeout 1000000 && \
     yarn cache clean
 COPY ${SRC_PATH} .
-COPY ./patches/* .
-RUN for patch in $(ls *.patch); do patch -p1 < $patch; done
-RUN cat << EOF > /entrypoint.sh
-npx yarn concurrently -n "dev,i18n" \
-    "yarn dev:watch" \
-    "yarn nodemon \
-        --watch './shared/i18n/locales/ru_RU' \
-        --exec 'yarn build:i18n'"
-EOF
+COPY ./patches/lang.patch .
+RUN patch -p1 < lang.patch
+COPY ./translation/ru.json ./shared/i18n/locales/ru_RU/translation.json
+RUN yarn build && \
+    yarn workspaces focus --production
+
+FROM node:24.15.0-slim AS release
+RUN apt-get update && \
+    apt-get install -y curl && \
+    rm -rf /var/lib/apt/lists/*
 ENV DATA_PATH=/var/lib/outline/data
+ENV USER=nodejs
+RUN addgroup --gid 1001 ${USER} && \
+    adduser --uid 1001 --ingroup ${USER} ${USER} && \
+    mkdir -p ${DATA_PATH} && \
+    chown -R ${USER}:${USER} ${DATA_PATH}/..
+ARG APP_PATH
+WORKDIR $APP_PATH
+COPY --chown=${USER}:${USER} --from=build $APP_PATH/node_modules ./node_modules
+COPY --chown=${USER}:${USER} --from=build $APP_PATH/build ./build
+COPY --chown=${USER}:${USER} --from=build $APP_PATH/server ./server
+COPY --chown=${USER}:${USER} --from=build $APP_PATH/public ./public
+COPY --chown=${USER}:${USER} --from=build $APP_PATH/.sequelizerc .
+COPY --chown=${USER}:${USER} --from=build $APP_PATH/package.json .
+ENV NODE_ENV=production
+ENV PORT=3000
+USER ${USER}
+EXPOSE ${PORT}
 VOLUME ${DATA_PATH}
-STOPSIGNAL SIGKILL
-ENTRYPOINT ["bash", "/entrypoint.sh"]
+HEALTHCHECK --interval=1m CMD curl -fs localhost:${PORT}/_health | grep -q OK || exit 1
+CMD ["node", "build/server/index.js"]

Dockerfile.dev

@@ -0,0 +1,24 @@
+ARG APP_PATH=/opt/outline
+ARG SRC_PATH=./outline
+
+FROM node:24.15.0
+ARG APP_PATH
+ARG SRC_PATH
+ARG CDN_URL
+WORKDIR $APP_PATH
+COPY ${SRC_PATH}/package.json ${SRC_PATH}/yarn.lock ${SRC_PATH}/.yarnrc.yml ./
+COPY ${SRC_PATH}/patches ./patches
+ENV NODE_OPTIONS='--max-old-space-size=24000'
+RUN corepack enable && \
+    yarn install --immutable --network-timeout 1000000 && \
+    yarn cache clean
+COPY ${SRC_PATH} .
+COPY ./patches/* .
+RUN for patch in $(ls *.patch); do patch -p1 < $patch; done
+RUN cat << EOF > /entrypoint.sh
+yarn dev:watch
+EOF
+ENV DATA_PATH=/var/lib/outline/data
+VOLUME ${DATA_PATH}
+STOPSIGNAL SIGKILL
+ENTRYPOINT ["bash", "/entrypoint.sh"]

Dockerfile.prod

@@ -20,8 +20,8 @@
 ```yaml
 services:
   outline:
-    image: flameshikari/outline-ru:1.6.1
-    # image: ghcr.io/flameshikari/outline-ru:1.6.1
+    image: flameshikari/outline-ru:1.7.0
+    # image: ghcr.io/flameshikari/outline-ru:1.7.0
     env_file: ./docker.env
     expose:
       - 3000
@@ -93,7 +93,7 @@ services:
 
 2. Пулл изменений в подмодуле и переключение на последний доступный тег:
     ```sh
-    git submodule foreach 'git pull --rebase --tags && git checkout v1.6.1'
+    git submodule foreach 'git pull --rebase --tags && git checkout v1.7.0'
     ```
 
 3. Запуск контейнеров: