5cb2fb41f8
Merging for testing since this can't be tested without a merge to master
fix(ci): use --no-frozen-lockfile for docs deploy (pnpm migration)
The Build and Deploy Docs workflow ran `pnpm install --frozen-lockfile` and
failed on every master push after the pnpm migration:
[ERR_PNPM_OUTDATED_LOCKFILE] pnpm-lock.yaml is not up to date with
platform/core/package.json
- @ohif/ui (lockfile: workspace:*, manifest: 3.13.0-beta.90)
publish-version.mjs rewrites @ohif/* workspace deps from "workspace:*" to the
concrete release version and commits that bump to master, so the committed
manifests intentionally drift from pnpm-lock.yaml. Every CircleCI job already
passes --no-frozen-lockfile for exactly this reason (pnpm-workspace.yaml sets
frozenLockfile:true as the default); the docs workflow was the lone job still
using frozen and so broke the docs deploy.
Switch the docs install to --no-frozen-lockfile to match the rest of CI.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@
* fix(ci): write npm auth token to ~/.npmrc so publishes authenticate
NPM_PUBLISH wrote the registry auth token to ~/repo/.npmrc (the repo root),
but publish-package.mjs does process.chdir(packageDirectory) and runs
`npm publish` from inside each package (platform/ui, extensions/*, ...). npm
reads the project .npmrc from that package dir and the user .npmrc from
$HOME -- it never walks up to ~/repo/.npmrc -- so every publish failed with
ENEEDAUTH ("need auth ... requires you to be logged in").
publish-package.mjs catches and swallows per-package publish errors, so
NPM_PUBLISH still exited 0 and reported green; the breakage was silent. As a
result no @ohif/* package newer than 3.13.0-beta.89 (the last publish before
the pnpm migration) reached npm -- beta.90 and beta.91 are missing and the
beta dist-tag is stuck at beta.89.
Write the token to ~/.npmrc (npm per-user config, read regardless of cwd)
instead. This also stops clobbering the committed workspace-config .npmrc
(node-linker=hoisted) at the repo root, which the in-job pnpm install/build
relies on. Applied to all three auth steps for consistency.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(docker): copy preinstall.js before pnpm install in builder stage
The builder stage copies only the package.json manifests, runs
`pnpm install --no-frozen-lockfile`, and copies the rest of the source
afterward (for layer caching). But the root package.json defines a
"preinstall" lifecycle script (node preinstall.js) that pnpm runs at the
start of install -- before the source copy -- so the script file was absent
and install aborted:
. preinstall$ node preinstall.js
Error: Cannot find module '/usr/src/app/preinstall.js' (MODULE_NOT_FOUND)
ERROR: process "pnpm install --no-frozen-lockfile" did not complete
This surfaced once the .npmrc COPY fix (#6076) let the build advance past
the earlier COPY failure. preinstall.js is self-contained (it no-ops without
GITHUB_TOKEN and guards the AGENTS.md/CLAUDE.md symlink with existsSync), so
copying just the script into the early manifest layer is sufficient.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(build): declare postcss plugins in platform/app for Docker build
The shared root postcss.config.js (which platform/app re-exports) loads
postcss-import, postcss-preset-env, and cssnano, but none were declared in
platform/app or the root. They only reached node_modules by being hoisted
from platform/docs (postcss-import, postcss-preset-env) and transitively
(cssnano). The Docker image excludes platform/docs via .dockerignore and
libs/@cornerstonejs is not a workspace member, so under pnpm's stricter
node-linker=hoisted the app build failed to resolve the plugins:
Loading PostCSS "postcss-preset-env" plugin failed:
Cannot find module 'postcss-preset-env'
(The accompanying "Can't resolve assets/woff2/latin.woff2" error was a
cascade from the broken PostCSS chain and clears with this fix.)
Declare the three plugins the config explicitly loads as devDependencies of
platform/app, pinned to the versions already resolved by working builds
(postcss-import@14.1.0, postcss-preset-env@7.8.3, cssnano@5.1.15), so the
build no longer depends on incidental hoisting from docs.
The lockfile was regenerated against a workspace:* baseline so the only
@ohif change is none -- the diff adds just the postcss plugin trees, keeping
specifiers at workspace:* per the repo's convention. Verified by building the
full Docker image locally: rspack compiles with 0 errors and the image
exports successfully.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
88 lines
3.1 KiB
Docker
88 lines
3.1 KiB
Docker
# syntax=docker/dockerfile:1.7-labs
|
|
# This dockerfile is used to publish the `ohif/app` image on dockerhub.
|
|
#
|
|
# It's a good example of how to build our static application and package it
|
|
# with a web server capable of hosting it as static content.
|
|
#
|
|
# docker build
|
|
# --------------
|
|
# If you would like to use this dockerfile to build and tag an image, make sure
|
|
# you set the context to the project's root directory:
|
|
# https://docs.docker.com/engine/reference/commandline/build/
|
|
#
|
|
#
|
|
# SUMMARY
|
|
# --------------
|
|
# This dockerfile has two stages:
|
|
#
|
|
# 1. Building the React application for production
|
|
# 2. Setting up our Nginx (Alpine Linux) image w/ step one's output
|
|
#
|
|
|
|
|
|
# Stage 1: Build the application
|
|
# docker build -t ohif/viewer:latest .
|
|
# Copy Files
|
|
FROM node:24-slim as builder
|
|
|
|
RUN apt-get update && apt-get install -y --no-install-recommends build-essential python3 \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
RUN npm install -g pnpm@11
|
|
|
|
RUN mkdir /usr/src/app
|
|
WORKDIR /usr/src/app
|
|
ENV PATH=/usr/src/app/node_modules/.bin:$PATH
|
|
|
|
# Copy package manifests for install caching. preinstall.js is included because
|
|
# the root package.json's "preinstall" lifecycle script (node preinstall.js)
|
|
# runs during `pnpm install` below -- before the full source is copied -- so the
|
|
# script file must already be present or install fails with MODULE_NOT_FOUND.
|
|
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml .npmrc preinstall.js ./
|
|
COPY --parents ./extensions/*/package.json ./modes/*/package.json ./platform/*/package.json ./
|
|
# Run the install before copying the rest of the files
|
|
|
|
RUN pnpm install --no-frozen-lockfile
|
|
# Copy the local directory
|
|
COPY --link --exclude=pnpm-lock.yaml --exclude=package.json --exclude=Dockerfile . .
|
|
|
|
# Build here
|
|
# After install it should hopefully be stable until the local directory changes
|
|
ENV QUICK_BUILD true
|
|
# ENV GENERATE_SOURCEMAP=false
|
|
ARG APP_CONFIG=config/default.js
|
|
ARG PUBLIC_URL=/
|
|
ENV PUBLIC_URL=${PUBLIC_URL}
|
|
|
|
RUN pnpm run show:config
|
|
RUN pnpm run build
|
|
|
|
# Precompress files
|
|
RUN chmod u+x .docker/compressDist.sh
|
|
RUN ./.docker/compressDist.sh
|
|
|
|
# Stage 2: Bundle the built application into a Docker container
|
|
# which runs Nginx using Alpine Linux
|
|
FROM nginxinc/nginx-unprivileged:1.27-alpine as final
|
|
#RUN apk add --no-cache bash
|
|
ARG PUBLIC_URL=/
|
|
ENV PUBLIC_URL=${PUBLIC_URL}
|
|
ARG PORT=80
|
|
ENV PORT=${PORT}
|
|
RUN rm /etc/nginx/conf.d/default.conf
|
|
USER nginx
|
|
COPY --chown=nginx:nginx .docker/Viewer-v3.x /usr/src
|
|
RUN chmod 777 /usr/src/entrypoint.sh
|
|
COPY --from=builder /usr/src/app/platform/app/dist /usr/share/nginx/html${PUBLIC_URL}
|
|
# Copy paths that are renamed/redirected generally
|
|
# Microscopy libraries depend on root level include, so must be copied
|
|
COPY --from=builder /usr/src/app/platform/app/dist/dicom-microscopy-viewer /usr/share/nginx/html/dicom-microscopy-viewer
|
|
|
|
# In entrypoint.sh, app-config.js might be overwritten, so chmod it to be writeable.
|
|
# The nginx user cannot chmod it, so change to root.
|
|
USER root
|
|
RUN chown -R nginx:nginx /usr/share/nginx/html && chmod -R 777 /usr/share/nginx/html
|
|
USER nginx
|
|
ENTRYPOINT ["/usr/src/entrypoint.sh"]
|
|
CMD ["nginx", "-g", "daemon off;"]
|