mirror of
https://github.com/BetterCorp/BetterFrame.git
synced 2026-05-26 16:56:33 +00:00
fix: resolve merge conflict + align BSB workdir /home/bsb
Resolved coolify compose conflict — took remote bind mount pattern. All paths now use /home/bsb (BSB container workdir, not /app). Both compose files use bind mount for sec-config.yaml. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
commit
238aa4f9af
4 changed files with 17 additions and 17 deletions
|
|
@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||
|
||||
RUN mkdir -p /var/lib/betterframe && chown node:node /var/lib/betterframe
|
||||
|
||||
WORKDIR /app
|
||||
WORKDIR /home/bsb
|
||||
|
||||
# Copy built plugin + deps
|
||||
COPY --from=builder /app/node_modules ./node_modules
|
||||
|
|
@ -52,7 +52,7 @@ COPY --from=builder /app/tsconfig.base.json ./tsconfig.base.json
|
|||
COPY --from=builder /app/server/lib/web-static ./lib/web-static
|
||||
|
||||
# Bake version
|
||||
RUN echo "$BF_SERVER_VERSION" > /app/.bf-version
|
||||
RUN echo "$BF_SERVER_VERSION" > /home/bsb/.bf-version
|
||||
|
||||
VOLUME /var/lib/betterframe
|
||||
|
||||
|
|
|
|||
|
|
@ -24,8 +24,10 @@ services:
|
|||
environment:
|
||||
- TZ=UTC
|
||||
volumes:
|
||||
- betterframe-data:/var/lib/betterframe
|
||||
- ./sec-config.yaml:/app/sec-config.yaml:ro
|
||||
- type: bind
|
||||
source: ${SERVER_SEC_CONFIG:-./sec-config.yaml}
|
||||
target: /home/bsb/sec-config.yaml
|
||||
read_only: true
|
||||
expose:
|
||||
- "18080"
|
||||
- "18081"
|
||||
|
|
@ -66,7 +68,9 @@ services:
|
|||
environment:
|
||||
- TZ=UTC
|
||||
volumes:
|
||||
- nodered-data:/data
|
||||
- type: bind
|
||||
source: ${NODERED_DATA_DIR:./nrdata}
|
||||
target: /data
|
||||
expose:
|
||||
- "1880"
|
||||
healthcheck:
|
||||
|
|
@ -88,7 +92,9 @@ services:
|
|||
- POSTGRES_PASSWORD=${BF_PG_PASSWORD:-betterframe}
|
||||
- POSTGRES_DB=${BF_PG_DB:-betterframe}
|
||||
volumes:
|
||||
- postgres-data:/var/lib/postgresql
|
||||
- type: bind
|
||||
source: ${POSTGRES_DATA_DIR:./pgdata}
|
||||
target: /var/lib/postgresql
|
||||
expose:
|
||||
- "5432"
|
||||
healthcheck:
|
||||
|
|
@ -100,14 +106,6 @@ services:
|
|||
networks:
|
||||
- betterframe
|
||||
|
||||
volumes:
|
||||
betterframe-data:
|
||||
name: ${BF_DATA_VOLUME_NAME:-betterframe-data}
|
||||
nodered-data:
|
||||
name: ${NODERED_DATA_VOLUME_NAME:-nodered-data}
|
||||
postgres-data:
|
||||
name: ${BF_PG_VOLUME_NAME:-betterframe-postgres}
|
||||
|
||||
networks:
|
||||
betterframe:
|
||||
driver: bridge
|
||||
|
|
|
|||
|
|
@ -34,8 +34,10 @@ services:
|
|||
environment:
|
||||
- TZ=UTC
|
||||
volumes:
|
||||
- betterframe-data:/var/lib/betterframe
|
||||
- ./sec-config.yaml:/app/sec-config.yaml:ro
|
||||
- type: bind
|
||||
source: ${SERVER_SEC_CONFIG:-./sec-config.yaml}
|
||||
target: /home/bsb/sec-config.yaml
|
||||
read_only: true
|
||||
expose:
|
||||
- "18080"
|
||||
- "18081"
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ let cached: string | null = null;
|
|||
export function serverVersion(): string {
|
||||
if (cached) return cached;
|
||||
try {
|
||||
const v = readFileSync("/app/.bf-version", "utf8").trim();
|
||||
const v = readFileSync("/home/bsb/.bf-version", "utf8").trim();
|
||||
cached = v && v !== "dev" ? v : "dev";
|
||||
} catch {
|
||||
cached = "dev";
|
||||
|
|
|
|||
Loading…
Reference in a new issue