Compare commits

...

26 Commits

Author SHA1 Message Date
Tom Moor 5f7490b577 v0.82.1-28 2025-04-10 19:18:53 -04:00
Tom Moor 66dd07d6ae again 2025-04-10 19:18:49 -04:00
Tom Moor ff06745924 v0.82.1-27 2025-04-10 08:38:48 -04:00
Tom Moor a739066743 mem 2025-04-10 08:38:46 -04:00
Tom Moor 5ae0e05a00 v0.82.1-26 2025-04-10 08:34:06 -04:00
Tom Moor 73fe5def43 mem 2025-04-10 08:34:03 -04:00
Tom Moor 2e26531af4 v0.82.1-25 2025-04-10 08:09:31 -04:00
Tom Moor 6f9e247769 More memory 2025-04-10 08:09:28 -04:00
Tom Moor 83b212cc9c v0.82.1-24 2025-04-10 07:58:53 -04:00
Tom Moor 1e225343b6 More memory 2025-04-10 07:58:49 -04:00
Tom Moor 4af4c775f3 v0.82.1-23 2025-04-09 23:51:33 -04:00
Tom Moor 7097686552 Reduce platforms 2025-04-09 23:51:28 -04:00
Tom Moor 590b10c4ef v0.82.1-22 2025-04-09 23:27:04 -04:00
Tom Moor e9f9a2d4da fix: don't treat build warnings as errors 2025-04-09 23:27:00 -04:00
Tom Moor a40ed6ed5f v0.82.1-21 2025-04-09 22:45:43 -04:00
Tom Moor 66a926bcd9 Add cmake 2025-04-09 22:45:36 -04:00
Tom Moor 6b86840e41 v0.82.1-20 2025-04-09 22:09:26 -04:00
Tom Moor 3c8a086732 fml 2025-04-09 22:09:21 -04:00
Tom Moor 78a8d19ca0 v0.82.1-19 2025-04-09 21:03:03 -04:00
Tom Moor ef0b6b69d8 large base image 2025-04-09 21:02:22 -04:00
Tom Moor 0475f441a6 v0.82.1-18 2025-03-31 19:12:40 -04:00
Tom Moor 0a5b514fb5 Add missing build deps previously provided by circleci/buildpack-deps:stretch 2025-03-31 19:12:35 -04:00
Tom Moor 98ef8dc65d v0.82.1-17 2025-03-31 18:53:07 -04:00
Tom Moor 5e75baf831 Attempt larger vm 2025-03-31 18:52:50 -04:00
Tom Moor 39c43b89e1 v0.82.1-16 2025-03-31 18:34:51 -04:00
Tom Moor 9c7f0c08fb wip 2025-03-31 18:34:02 -04:00
7 changed files with 58 additions and 28 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ env:
DATABASE_URL: postgres://postgres:password@localhost:5432/outline_test
REDIS_URL: redis://127.0.0.1:6379
URL: http://localhost:3000
NODE_OPTIONS: --max-old-space-size=8000
NODE_OPTIONS: --max-old-space-size=8192
SECRET_KEY: F0E5AD933D7F6FD8F4DBB3E038C501C052DC0593C686D21ACB30AE205D2F634B
UTILS_SECRET: 123456
SLACK_VERIFICATION_TOKEN: 123456
+45 -14
View File
@@ -3,7 +3,7 @@ name: Docker
on:
push:
tags:
- 'v*'
- "v*"
env:
IMAGE_NAME: outlinewiki/outline
@@ -11,8 +11,20 @@ env:
jobs:
build-and-push:
runs-on: ubuntu-latest
runs-on: ubicloud-standard-8
strategy:
fail-fast: false
matrix:
platform:
- linux/amd64
- linux/arm64
- linux/arm/v7
steps:
- name: Prepare
run: |
platform=${{ matrix.platform }}
echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
- name: Checkout
uses: actions/checkout@v4
@@ -22,6 +34,16 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Docker base meta
id: base_meta
uses: docker/metadata-action@v5
with:
images: |
${{ env.BASE_IMAGE_NAME }}
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Login to Docker Hub
uses: docker/login-action@v3
with:
@@ -29,24 +51,33 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push base image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile.base
push: true
tags: ${{ env.BASE_IMAGE_NAME }}:latest
platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
tags: ${{ steps.base_meta.outputs.tags }}
labels: ${{ steps.base_meta.outputs.labels }}
platforms: ${{ matrix.platform }}
- name: Extract version
id: version
run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
images: |
${{ env.IMAGE_NAME }}
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
- name: Build and push main image
uses: docker/build-push-action@v5
- name: Build and push
uses: docker/build-push-action@v6
with:
context: .
file: Dockerfile
push: true
platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
tags: |
${{ env.IMAGE_NAME }}:latest
${{ env.IMAGE_NAME }}:${{ steps.version.outputs.VERSION }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
platforms: ${{ matrix.platform }}
build-args: |
BASE_IMAGE=${{ env.BASE_IMAGE_NAME }}:${{ steps.base_meta.outputs.version }}
+3 -2
View File
@@ -1,5 +1,6 @@
ARG APP_PATH=/opt/outline
FROM outlinewiki/outline-base AS base
ARG BASE_IMAGE=outlinewiki/outline-base
FROM ${BASE_IMAGE} AS base
ARG APP_PATH
WORKDIR $APP_PATH
@@ -30,7 +31,7 @@ RUN addgroup --gid 1001 nodejs && \
adduser --uid 1001 --ingroup nodejs nodejs && \
chown -R nodejs:nodejs $APP_PATH/build && \
mkdir -p /var/lib/outline && \
chown -R nodejs:nodejs /var/lib/outline
chown -R nodejs:nodejs /var/lib/outline
ENV FILE_STORAGE_LOCAL_ROOT_DIR=/var/lib/outline/data
RUN mkdir -p "$FILE_STORAGE_LOCAL_ROOT_DIR" && \
+4 -1
View File
@@ -1,11 +1,14 @@
ARG APP_PATH=/opt/outline
FROM node:20-slim AS deps
FROM node:20 AS deps
ARG APP_PATH
WORKDIR $APP_PATH
COPY ./package.json ./yarn.lock ./
COPY ./patches ./patches
RUN apt-get update && apt-get install -y cmake
ENV NODE_OPTIONS="--max-old-space-size=24000"
RUN yarn install --no-optional --frozen-lockfile --network-timeout 1000000 && \
yarn cache clean
+2 -2
View File
@@ -3,7 +3,7 @@ Business Source License 1.1
Parameters
Licensor: General Outline, Inc.
Licensed Work: Outline 0.82.0
Licensed Work: Outline 0.82.1-28
The Licensed Work is (c) 2025 General Outline, Inc.
Additional Use Grant: You may make use of the Licensed Work, provided that
you may not use the Licensed Work for a Document
@@ -15,7 +15,7 @@ Additional Use Grant: You may make use of the Licensed Work, provided that
Licensed Work by creating teams and documents
controlled by such third parties.
Change Date: 2029-02-15
Change Date: 2029-04-10
Change License: Apache License, Version 2.0
+2 -2
View File
@@ -377,5 +377,5 @@
"rollup": "^4.5.1",
"prismjs": "1.30.0"
},
"version": "0.82.0"
}
"version": "0.82.1-28"
}
+1 -6
View File
@@ -15120,16 +15120,11 @@ tslib@2.4.0:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
integrity "sha1-fOyqfwc85oCgWEeqd76UEJjzbcM= sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
tslib@2.8.1:
tslib@2.8.1, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2:
version "2.8.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
tsscmp@1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.6.tgz#85b99583ac3589ec4bfef825b5000aa911d605eb"