Work around a build problem with oursky/authgear-server and jazzicon #…

…4442 ref DEV-1527
authgear · Jul 11, 2024 · 05ef0ba · 05ef0ba
2 parents 26a809e + 8e41309
commit 05ef0ba
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/authui/README.md b/authui/README.md
@@ -9,3 +9,11 @@ make generate-material-icons
 ```
 
 After that, commit the changes in `scripts/python/material-icons.txt`, `authui/src/authflowv2/icons/material-symbols-outlined-subset.ttf` and `authui/src/authflowv2/icons/material-symbols-outlined-subset.woff2`.
+
+### @metamask/jazzicon
+
+In oursky/authgear-server, the connection to the URL `https://codeload.github.com/MetaMask/jazzicon/tar.gz/4fe23bbbe5088e128cb24082972e28d87e76d156` fails very often.
+Therefore, we download the tarball, and use it directly.
+We also updated to the latest commit.
+See https://github.com/MetaMask/jazzicon/compare/d923914fda6a8795f74c2e66134f73cd72070667..4fe23bbbe5088e128cb24082972e28d87e76d156 for the changes.
+The changes DO NOT cover runtime behavior changes, so it is safe to upgrade.
diff --git a/authui/package-lock.json b/authui/package-lock.json
diff --git a/authui/package.json b/authui/package.json
@@ -59,7 +59,7 @@
     "@hotwired/stimulus": "3.2.2",
     "@hotwired/turbo": "7.3.0",
     "@metamask/detect-provider": "2.0.0",
-    "@metamask/jazzicon": "github:MetaMask/jazzicon#d923914fda6a8795f74c2e66134f73cd72070667",
+    "@metamask/jazzicon": "file:tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz",
     "@sentry/browser": "7.80.0",
     "@sentry/tracing": "7.80.0",
     "@tabler/icons": "1.107.0",

diff --git a/authui/tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz b/authui/tarballs/jazzicon-4fe23bbbe5088e128cb24082972e28d87e76d156.tar.gz
diff --git a/cmd/authgear/Dockerfile b/cmd/authgear/Dockerfile
@@ -27,6 +27,8 @@ WORKDIR /usr/src/app
 COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/
 RUN cd ./scripts/npm && npm ci
 COPY ./authui/package.json ./authui/package-lock.json ./authui/
+# See /authui/README.md for the reason why we need to copy tarballs.
+COPY ./authui/tarballs/. ./authui/tarballs/.
 RUN cd ./authui && npm ci
 COPY . .
 RUN make authui GIT_HASH=$GIT_HASH

diff --git a/cmd/portal/Dockerfile b/cmd/portal/Dockerfile
@@ -27,6 +27,8 @@ WORKDIR /usr/src/app
 COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/
 RUN cd ./scripts/npm && npm ci
 COPY ./authui/package.json ./authui/package-lock.json ./authui/
+# See /authui/README.md for the reason why we need to copy tarballs.
+COPY ./authui/tarballs/. ./authui/tarballs/.
 RUN cd ./authui && npm ci
 COPY . .
 RUN make authui GIT_HASH=$GIT_HASH

diff --git a/custombuild/cmd/authgearx/Dockerfile b/custombuild/cmd/authgearx/Dockerfile
@@ -45,6 +45,8 @@ WORKDIR /usr/src/app
 COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/
 RUN cd ./scripts/npm && npm ci
 COPY ./authui/package.json ./authui/package-lock.json ./authui/
+# See /authui/README.md for the reason why we need to copy tarballs.
+COPY ./authui/tarballs/. ./authui/tarballs/.
 RUN cd ./authui && npm ci
 COPY . .
 RUN make authui GIT_HASH=$GIT_HASH

diff --git a/custombuild/cmd/portalx/Dockerfile b/custombuild/cmd/portalx/Dockerfile
@@ -45,6 +45,8 @@ WORKDIR /usr/src/app
 COPY ./scripts/npm/package.json ./scripts/npm/package-lock.json ./scripts/npm/
 RUN cd ./scripts/npm && npm ci
 COPY ./authui/package.json ./authui/package-lock.json ./authui/
+# See /authui/README.md for the reason why we need to copy tarballs.
+COPY ./authui/tarballs/. ./authui/tarballs/.
 RUN cd ./authui && npm ci
 COPY . .
 RUN make authui GIT_HASH=$GIT_HASH