From e4aef7c43b0a98fa87330aaca5519525d1f906ed Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Thu, 25 Jul 2024 14:59:06 -0400 Subject: [PATCH 1/2] announce armhf, armel build fixes --- BUILD.md | 10 ++++++++-- CHANGELOG.md | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/BUILD.md b/BUILD.md index c74c0d686..181c5b7cd 100644 --- a/BUILD.md +++ b/BUILD.md @@ -2,9 +2,10 @@ ## zrok -At this time, building `zrok` is pretty straightforward. You will require `node` v16+ to be installed in order to complete the build as well as `go`. Because `zrok` uses CGO, you will also need to have a working C compiler toolchain. [TDM-GCC](https://jmeubank.github.io/tdm-gcc/download/) works great on Windows (just make sure it's in your PATH). +At this time, building `zrok` is pretty straightforward. You will require `node` v18+ to be installed in order to complete the build as well as `go`. Because `zrok` uses CGO, you will also need to have a working C compiler toolchain. [TDM-GCC](https://jmeubank.github.io/tdm-gcc/download/) works great on Windows (just make sure it's in your PATH). To build, follow these steps: + * clone the repository * change to the existing `ui` folder * run `npm install` @@ -13,15 +14,20 @@ To build, follow these steps: * make sure the dist directory exists: `mkdir -p dist` * build the go project normally: `go build -o dist ./...` +## Cross-build zrok with Docker + +Build a `zrok` snapshot binary for amd64, arm64, armhf, or armel with [the `cross-build` container](./docker/images/cross-build/README.md). + ## Documentation/Website The doc website is based on [Docusaurus](https://docusaurus.io/) which in turn will require `npm` to be installed. `yarn` is another tool which is used to start the Docusaurus dev site. To build the doc: + * cd to `website` * run `yarn install` (usually only needed once) * run `yarn start` to start the development server (make sure port 3000 is open or change the port) The development server infrequently behaves differently than the 'production' build. If you must use the 'production' -build it is slower, but you can accomplish that with `yarn build`. \ No newline at end of file +build it is slower, but you can accomplish that with `yarn build`. diff --git a/CHANGELOG.md b/CHANGELOG.md index c1412bda3..bb9b0951b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ FEATURE: New interstitial pages that can be enabled per-frontend, and disabled p CHANGE: Enable `"declaration": true` in `tsconfig.json` for Node SDK. -FIX: Statically link arm 32bit build for broader compatibility. +FIX: build 32bit build for armhf to fix [the FPE issue](https://github.com/openziti/zrok/issues/654) and [the missing link issue](https://github.com/openziti/zrok/issues/642); add [cross-build instructions](./BUILD.md) (add new snapshot build target `armel`) ## v0.4.35 From bb0cb56e10068a10e0a2c18646fac4c52210c3c9 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Thu, 25 Jul 2024 15:03:38 -0400 Subject: [PATCH 2/2] announce documentation and new build target change separately --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb9b0951b..a8280ce37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ FEATURE: New interstitial pages that can be enabled per-frontend, and disabled p CHANGE: Enable `"declaration": true` in `tsconfig.json` for Node SDK. -FIX: build 32bit build for armhf to fix [the FPE issue](https://github.com/openziti/zrok/issues/654) and [the missing link issue](https://github.com/openziti/zrok/issues/642); add [cross-build instructions](./BUILD.md) (add new snapshot build target `armel`) +FIX: build 32bit build for armhf to fix [the FPE issue](https://github.com/openziti/zrok/issues/654) and [the missing link issue](https://github.com/openziti/zrok/issues/642) + +CHANGE: add [cross-build instructions](./BUILD.md) (includes new snapshot build target `armel`) ## v0.4.35