9 Commits

Author SHA1 Message Date
cgalo5758 81b5b644d8 Document optional npm install strategy 2026-06-22 19:10:07 -05:00
cgalo5758 6016d238e7 Clean up npm install strategy example 2026-06-22 19:08:30 -05:00
cgalo5758 7c6dd2b93c Release 0.41.0-rc.1-3 2026-06-22 19:07:59 -05:00
cgalo5758 1198ca5c71 Release 0.41.0-rc.1-2 2026-06-20 21:41:14 -05:00
Robert Best b17d6addc1 Release 0.41.0-rc.1-1 2026-06-15 14:59:49 -04:00
Robert Best f18f9126c5 Missed a step[ 2026-06-15 14:56:46 -04:00
Robert Best 4a0fa50ba1 Add argument for specifying the install strategy of a build 2026-06-15 14:52:14 -04:00
Robert Best 23c275c29d Use nested install strategy
The latest social security plugin is the first to not use coffeescript, and it doesn't like our flat install... switching to nested means the security module can find the files it is looking for in our more strict docker environment.
2026-06-05 12:39:05 -04:00
Robert Best 862f393473 Release 0.41.0-rc.0-1 2026-05-27 00:46:16 -04:00
3 changed files with 19 additions and 7 deletions
+6 -1
View File
@@ -4,6 +4,7 @@ ARG WIKI_VERSION
ARG TAG
ARG SOURCE_COMMIT
ARG BUILD_DATE
ARG NPM_INSTALL_STRATEGY=""
# Labels for metadata
LABEL org.opencontainers.image.source="https://git.coopcloud.tech/wiki-cafe/fedwiki-oci-image" \
@@ -20,10 +21,14 @@ WORKDIR "/home/node"
ENV NPM_CONFIG_PREFIX="/home/node"
ENV PATH="/home/node/bin:${PATH}"
RUN npm install -g "wiki@${WIKI_VERSION}"
RUN npm install -g "wiki@${WIKI_VERSION}" ${NPM_INSTALL_STRATEGY}
# wiki@0.41.0-rc.1 bundles wiki-security-social@0.1.0-rc.1, which ignores
# oauth2_IdField (admin/owner break). Pin rc.5 explicitly so it overrides the
# bundled rc.1 and satisfies wiki-security-composable's ^0.1.0-rc.5 peer.
RUN cd $(npm root -g)/wiki \
&& npm install \
wiki-security-social@0.1.0-rc.5 \
wiki-plugin-farmmanager \
wiki-plugin-useraccesstokens \
wiki-security-composable \
+8 -1
View File
@@ -12,13 +12,19 @@ The tag format is `X.Y.Z-R`, where:
Increment the revision number `R` if the wiki package version `X.Y.Z` remains the same. If the wiki package version changes, reset `R` to `1`.
To make the release process smoother, set the image tag and wiki package version as environment variables:
To make the release process smoother, set the image tag and wiki package version as environment variables. You can also modify the install strategy of the build if you like, but its optional. If you skip exporting that variable, the default strategy (hoisted) will be used:
```bash
export WIKI_VERSION=X.Y.Z
export TAG=${WIKI_VERSION}-R
```
This can sometimes be useful in some situations:
```bash
export NPM_INSTALL_STRATEGY="--install-strategy=nested"
```
## Building the container image
Build the container image for your local platform to test before publishing:
@@ -29,6 +35,7 @@ docker buildx build \
--no-cache \
--build-arg WIKI_VERSION=$WIKI_VERSION \
--build-arg TAG=$TAG \
--build-arg NPM_INSTALL_STRATEGY=$NPM_INSTALL_STRATEGY \
--build-arg SOURCE_COMMIT=$(git rev-parse HEAD) \
--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
-t git.coopcloud.tech/wiki-cafe/fedwiki-oci-image:latest \
+5 -5
View File
@@ -1,11 +1,11 @@
{
"wiki": "0.40.1",
"wiki": "0.41.0-rc.1",
"wiki-server": "0.27.0",
"wiki-client": "0.32.0",
"security": {
"wiki-security-composable": "0.1.3",
"wiki-security-composable": "0.2.0",
"wiki-security-friends": "0.3.1",
"wiki-security-passportjs": "0.14.0"
"wiki-security-social": "0.1.0-rc.5"
},
"plugins": {
"wiki-plugin-activity": "0.7.1",
@@ -19,7 +19,7 @@
"wiki-plugin-code": "0.6.0",
"wiki-plugin-data": "0.4.0",
"wiki-plugin-factory": "0.4.0",
"wiki-plugin-farmmanager": "0.1.1",
"wiki-plugin-farmmanager": "0.4.1",
"wiki-plugin-flagmatic": "0.3.0",
"wiki-plugin-force": "0.6.0",
"wiki-plugin-frame": "0.10.3",
@@ -33,7 +33,7 @@
"wiki-plugin-map": "0.9.1",
"wiki-plugin-markdown": "0.5.3",
"wiki-plugin-math": "0.2.0",
"wiki-plugin-mech": "0.1.48-1",
"wiki-plugin-mech": "0.1.48-2",
"wiki-plugin-metabolism": "0.4.0",
"wiki-plugin-method": "0.4.1",
"wiki-plugin-pagefold": "0.4.0",