Skip to content

fix: supply IDP login media assets for no-npm (rolling) builds #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DeepDiver1975 wants to merge 1 commit into from
Closed

fix: supply IDP login media assets for no-npm (rolling) builds #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion v8/Dockerfile.multiarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,35 @@ RUN git clone --depth 1 --branch "${GIT_REF}" https://github.com/owncloud/ocis.g
# Upstream commit da7ef6050 ("service/idp no-npm") dropped the npm build and now
# commits the identifier assets directly, so master builds have no package.json
# and must skip pnpm. Release tags (e.g. v8.0.1) still require the pnpm build.
#
# The no-npm rewrite ships a static theme.css that references a favicon plus
# media assets (background image + Inter web fonts) which it never committed and
# provides no build step to generate (upstream bug OCISDEV-696 / da7ef6050). The
# files are embedded into the binary via `//go:embed assets/*`, so when they are
# absent the login page renders without its icon, background, and font. We supply
# them here for the no-npm layout: the favicon from owncloud/assets (matching the
# pnpm path above) and the media files recovered from the pre-no-npm parent commit
# at the exact (webpack-hashed) names theme.css references. Remove this workaround
# once upstream ships the media — see https://github.com/owncloud/ocis sources.
ARG IDP_MEDIA_REF="02395858176dba538a952b84ba23021567b02be8"
WORKDIR /build/services/idp
RUN if [ -f package.json ]; then \
pnpm install --frozen-lockfile && \
pnpm build && \
curl -fsSL https://raw.githubusercontent.com/owncloud/assets/main/favicon.ico \
-o assets/identifier/static/favicon.ico; \
else \
echo "services/idp has no package.json (no-npm upstream layout); skipping pnpm build"; \
echo "services/idp has no package.json (no-npm upstream layout); skipping pnpm build" && \
mkdir -p assets/identifier/static/media && \
curl -fsSL https://raw.githubusercontent.com/owncloud/assets/main/favicon.ico \
-o assets/identifier/static/favicon.ico && \
base="https://raw.githubusercontent.com/owncloud/ocis/${IDP_MEDIA_REF}/services/idp" && \
curl -fsSL "${base}/src/images/background.jpg" \
-o assets/identifier/static/media/background.7296b9ab..jpg && \
curl -fsSL "${base}/src/fonts/inter.woff2" \
-o assets/identifier/static/media/inter.d5c51099..woff2 && \
curl -fsSL "${base}/src/fonts/inter.ttf" \
-o assets/identifier/static/media/inter.aadb65ac..ttf; \
fi

WORKDIR /build/services/web
Expand Down