Skip to content

Open-source status page, incident response and uptime monitoring

fix workflow (#1713)

Thibault Le Ouaydbacbdafdd07
diff --git a/apps/workflows/Dockerfile b/apps/workflows/Dockerfile
index 397247bbf..7b72c24eb 100644
--- a/apps/workflows/Dockerfile
+++ b/apps/workflows/Dockerfile
@@ -9,6 +9,17 @@ LABEL \
org.opencontainers.image.base.name="docker.io/debian:bullseye-slim"
RUN apt update && apt install -y ca-certificates && update-ca-certificates
+# docker
+FROM oven/bun@sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3 AS docker
+LABEL \
+ org.opencontainers.image.base.digest="sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3" \
+ org.opencontainers.image.base.name="docker.io/oven/bun:1.3.5"
+WORKDIR /app/apps/workflows
+COPY \
+ --link \
+ "." "/app/"
+RUN bun run src/build-docker.ts
+
# install
FROM oven/bun@sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3 AS install
LABEL \
@@ -60,6 +71,18 @@ COPY \
"/app/node_modules" "/app/node_modules"
RUN bun build --compile --target bun --sourcemap --format=cjs src/index.ts --outfile=app
+# libsql
+FROM oven/bun@sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4 AS libsql
+LABEL \
+ org.opencontainers.image.base.digest="sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4" \
+ org.opencontainers.image.base.name="docker.io/oven/bun:1.3.3"
+WORKDIR /app/
+COPY \
+ --from=docker \
+ --link \
+ "/app/apps/build-docker/package.json" "/app/package.json"
+RUN bun install
+
# runtime
FROM debian@sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b AS runtime
LABEL \
@@ -79,23 +102,12 @@ COPY \
--link \
"/app/apps/workflows/app" "/app/apps/workflows/"
COPY \
- --from=build \
- --chown=1000:1000 \
- --link \
- "/app/packages/db" "/app/packages/db/"
-COPY \
+ --from=libsql \
--chown=1000:1000 \
- --chmod=755 \
--link \
- "apps/workflows/start.sh" "/app/start.sh"
+ "/app/node_modules" "/app/packages/db/node_modules"
COPY \
- --from=build \
- --chown=1000:1000 \
- --chmod=755 \
- --link \
- "/usr/local/bin/bun" "/usr/local/bin/bun"
-COPY \
- --from=install \
+ --from=libsql \
--chown=1000:1000 \
--link \
"/app/node_modules" "/app/node_modules"
@@ -104,12 +116,6 @@ COPY \
--chown=1000:1000 \
--link \
"/etc/ssl/certs/ca-certificates.crt" "/etc/ssl/certs/"
-USER 0:0
-RUN <<EOF
-apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
-mkdir -p /app/data
-chown -R 1000:1000 /app/data
-EOF
USER 1000:1000
EXPOSE 3000
-ENTRYPOINT ["/bin/sh", "/app/start.sh"]
+ENTRYPOINT ["/app/apps/workflows/app"]
diff --git a/apps/workflows/dofigen.lock b/apps/workflows/dofigen.lock
index c507e201e..3ff820e54 100644
--- a/apps/workflows/dofigen.lock
+++ b/apps/workflows/dofigen.lock
@@ -12,27 +12,20 @@ effective: |
- /packages/error
- /packages/tracker
builders:
- build:
+ docker:
fromImage:
path: oven/bun
- digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
label:
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
- org.opencontainers.image.stage: build
- org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.5
+ org.opencontainers.image.base.digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
workdir: /app/apps/workflows
- env:
- NODE_ENV: production
copy:
- paths:
- .
target: /app/
- - fromBuilder: install
- paths:
- - /app/node_modules
- target: /app/node_modules
run:
- - bun build --compile --target bun --sourcemap --format=cjs src/index.ts --outfile=app --external '@libsql/*' --external libsql
+ - bun run src/build-docker.ts
ca-certs:
fromImage:
path: debian
@@ -47,9 +40,9 @@ effective: |
path: oven/bun
digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
label:
+ org.opencontainers.image.base.digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
org.opencontainers.image.base.name: docker.io/oven/bun:1.3.5
org.opencontainers.image.stage: install
- org.opencontainers.image.base.digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
workdir: /app/
run:
- bun install --production --frozen-lockfile --verbose
@@ -102,35 +95,6 @@ effective: |
source: packages/upstash/package.json
- target: packages/theme-store/package.json
source: packages/theme-store/package.json
- libsql:
- fromImage:
- path: oven/bun
- digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- label:
- org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
- workdir: /app/
- copy:
- - fromBuilder: docker
- paths:
- - /app/apps/build-docker/package.json
- target: /app/package.json
- run:
- - bun install
- docker:
- fromImage:
- path: oven/bun
- digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
- label:
- org.opencontainers.image.base.digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
- org.opencontainers.image.base.name: docker.io/oven/bun:1.3.5
- workdir: /app/apps/workflows
- copy:
- - paths:
- - .
- target: /app/
- run:
- - bun run src/build-docker.ts
build:
fromImage:
path: oven/bun
@@ -152,28 +116,33 @@ effective: |
target: /app/node_modules
run:
- bun build --compile --target bun --sourcemap --format=cjs src/index.ts --outfile=app
- ca-certs:
+ libsql:
fromImage:
- path: debian
- digest: sha256:c5f48c942c667e70d7e64b124cfc939c25a4a43207c0d14b45844d762dc1d50f
+ path: oven/bun
+ digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
label:
- org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
- org.opencontainers.image.base.digest: sha256:c5f48c942c667e70d7e64b124cfc939c25a4a43207c0d14b45844d762dc1d50f
+ org.opencontainers.image.base.name: docker.io/oven/bun:1.3.3
+ org.opencontainers.image.base.digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ workdir: /app/
+ copy:
+ - fromBuilder: docker
+ paths:
+ - /app/apps/build-docker/package.json
+ target: /app/package.json
run:
- - apt update && apt install -y ca-certificates && update-ca-certificates
+ - bun install
fromImage:
path: debian
digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
label:
- org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
- org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
org.opencontainers.image.source: https://github.com/openstatusHQ/openstatus
+ org.opencontainers.image.base.digest: sha256:530a3348fc4b5734ffe1a137ddbcee6850154285251b53c3425c386ea8fac77b
org.opencontainers.image.description: Background job processing and probe scheduling for OpenStatus
- org.opencontainers.image.authors: OpenStatus Team
- org.opencontainers.image.title: OpenStatus Workflows
org.opencontainers.image.vendor: OpenStatus
- org.opencontainers.image.authors: OpenStatus Team
+ org.opencontainers.image.base.name: docker.io/debian:bullseye-slim
+ org.opencontainers.image.title: OpenStatus Workflows
io.dofigen.version: 2.6.0
+ org.opencontainers.image.authors: OpenStatus Team
workdir: /app/
copy:
- fromBuilder: build
@@ -181,20 +150,11 @@ effective: |
- /app/apps/workflows/app
target: /app/apps/workflows/
chmod: '555'
- - fromBuilder: build
- paths:
- - /app/packages/db
- target: /app/packages/db/
- - paths:
- - apps/workflows/start.sh
- target: /app/start.sh
- chmod: '755'
- - fromBuilder: build
+ - fromBuilder: libsql
paths:
- - /usr/local/bin/bun
- target: /usr/local/bin/bun
- chmod: '755'
- - fromBuilder: install
+ - /app/node_modules
+ target: /app/packages/db/node_modules
+ - fromBuilder: libsql
paths:
- /app/node_modules
target: /app/node_modules
@@ -202,24 +162,12 @@ effective: |
paths:
- /etc/ssl/certs/ca-certificates.crt
target: /etc/ssl/certs/
- root:
- run:
- - apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
- - mkdir -p /app/data
- - chown -R 1000:1000 /app/data
entrypoint:
- - /bin/sh
- - /app/start.sh
+ - /app/apps/workflows/app
expose:
- port: 3000
images:
docker.io:
- oven:
- bun:
- 1.3.5:
- digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
- 1.3.3:
- digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
library:
debian:
bullseye-slim:
@@ -228,9 +176,11 @@ images:
bun:
1.3.3:
digest: sha256:fbf8e67e9d3b806c86be7a2f2e9bae801f2d9212a21db4dcf8cc9889f5a3c9c4
+ 1.3.5:
+ digest: sha256:e90cdbaf9ccdb3d4bd693aa335c3310a6004286a880f62f79b18f9b1312a8ec3
resources:
dofigen.yml:
- hash: a0ad1a5bb9b6026553537d163c77052133cbd7231927105febf9c2e86500ca3c
+ hash: 31cef4b70fa33ceb4b9b38f32c98ff13646d0f494bfb79c22734d22b67e9a1d8
content: |
ignore:
- node_modules
@@ -296,6 +246,22 @@ resources:
NODE_ENV: production
run: bun build --compile --target bun --sourcemap --format=cjs src/index.ts --outfile=app
+ docker:
+ fromImage: oven/bun:1.3.5
+ workdir: /app/apps/workflows
+ copy:
+ - . /app/
+ run: bun run src/build-docker.ts
+
+ libsql:
+ fromImage: oven/bun:1.3.3
+ workdir: /app/
+ copy:
+ - fromBuilder: docker
+ source: /app/apps/build-docker/package.json
+ target: /app/package.json
+ run: bun install
+
ca-certs:
fromImage: debian:bullseye-slim
run: apt update && apt install -y ca-certificates && update-ca-certificates
@@ -311,34 +277,20 @@ resources:
org.opencontainers.image.vendor: OpenStatus
org.opencontainers.image.authors: OpenStatus Team
- # Create data directory and install curl as root before switching to user 1000
- root:
- run:
- - apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
- - mkdir -p /app/data
- - chown -R 1000:1000 /app/data
-
# Copy artifacts from build stages
copy:
- fromBuilder: build
source: /app/apps/workflows/app
target: /app/apps/workflows/
chmod: "555"
- - fromBuilder: build
- source: /app/packages/db
- target: /app/packages/db/
- - source: apps/workflows/start.sh
- target: /app/start.sh
- chmod: "755"
- - fromBuilder: build
- source: /usr/local/bin/bun
- target: /usr/local/bin/bun
- chmod: "755"
- - fromBuilder: install
+ - fromBuilder: libsql
+ source: /app/node_modules
+ target: /app/packages/db/node_modules
+ - fromBuilder: libsql
source: /app/node_modules
target: /app/node_modules
- fromBuilder: ca-certs
source: /etc/ssl/certs/ca-certificates.crt
target: /etc/ssl/certs/
expose: "3000"
- entrypoint: ["/bin/sh", "/app/start.sh"]
+ entrypoint: /app/apps/workflows/app
diff --git a/apps/workflows/dofigen.yml b/apps/workflows/dofigen.yml
index 2f13461f8..55503319c 100644
--- a/apps/workflows/dofigen.yml
+++ b/apps/workflows/dofigen.yml
@@ -62,6 +62,22 @@ builders:
NODE_ENV: production
run: bun build --compile --target bun --sourcemap --format=cjs src/index.ts --outfile=app
+ docker:
+ fromImage: oven/bun:1.3.5
+ workdir: /app/apps/workflows
+ copy:
+ - . /app/
+ run: bun run src/build-docker.ts
+
+ libsql:
+ fromImage: oven/bun:1.3.3
+ workdir: /app/
+ copy:
+ - fromBuilder: docker
+ source: /app/apps/build-docker/package.json
+ target: /app/package.json
+ run: bun install
+
ca-certs:
fromImage: debian:bullseye-slim
run: apt update && apt install -y ca-certificates && update-ca-certificates
@@ -77,34 +93,20 @@ labels:
org.opencontainers.image.vendor: OpenStatus
org.opencontainers.image.authors: OpenStatus Team
-# Create data directory and install curl as root before switching to user 1000
-root:
- run:
- - apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
- - mkdir -p /app/data
- - chown -R 1000:1000 /app/data
-
# Copy artifacts from build stages
copy:
- fromBuilder: build
source: /app/apps/workflows/app
target: /app/apps/workflows/
chmod: "555"
- - fromBuilder: build
- source: /app/packages/db
- target: /app/packages/db/
- - source: apps/workflows/start.sh
- target: /app/start.sh
- chmod: "755"
- - fromBuilder: build
- source: /usr/local/bin/bun
- target: /usr/local/bin/bun
- chmod: "755"
- - fromBuilder: install
+ - fromBuilder: libsql
+ source: /app/node_modules
+ target: /app/packages/db/node_modules
+ - fromBuilder: libsql
source: /app/node_modules
target: /app/node_modules
- fromBuilder: ca-certs
source: /etc/ssl/certs/ca-certificates.crt
target: /etc/ssl/certs/
expose: "3000"
-entrypoint: ["/bin/sh", "/app/start.sh"]
+entrypoint: /app/apps/workflows/app