mirror of
https://github.com/openziti/zrok.git
synced 2025-01-09 07:28:15 +01:00
Merge branch 'main' into v1_0_0
This commit is contained in:
commit
47295e383b
2
.github/dependabot.yml
vendored
2
.github/dependabot.yml
vendored
@ -12,4 +12,4 @@ updates:
|
|||||||
update-types:
|
update-types:
|
||||||
- "major"
|
- "major"
|
||||||
- "minor"
|
- "minor"
|
||||||
- "patch"
|
- "patch"
|
||||||
|
@ -8,6 +8,14 @@ FEATURE: New "zrok Agent", a background manager process for your zrok environmen
|
|||||||
|
|
||||||
FEATURE: `zrok share [public|private|reserved]` and `zrok access private` now auto-detect if the zrok Agent is running in an environment and will automatically service share and access requests through the Agent, rather than in-process if the Agent is running. If the Agent is not running, operation remains as it was in `v0.4.x` and the share or access is handled in-process. New `--force-agent` and `--force-local` flags exist to skip Agent detection and manually select an operating mode (https://github.com/openziti/zrok/issues/751)
|
FEATURE: `zrok share [public|private|reserved]` and `zrok access private` now auto-detect if the zrok Agent is running in an environment and will automatically service share and access requests through the Agent, rather than in-process if the Agent is running. If the Agent is not running, operation remains as it was in `v0.4.x` and the share or access is handled in-process. New `--force-agent` and `--force-local` flags exist to skip Agent detection and manually select an operating mode (https://github.com/openziti/zrok/issues/751)
|
||||||
|
|
||||||
|
## v0.4.45
|
||||||
|
|
||||||
|
FIX: Document unique names
|
||||||
|
|
||||||
|
FIX: reduce Docker image sizes (https://github.com/openziti/zrok/pull/783)
|
||||||
|
|
||||||
|
FIX: Correct the download URL for the armv7 Linux release (https://github.com/openziti/zrok/issues/782)
|
||||||
|
|
||||||
## v0.4.44
|
## v0.4.44
|
||||||
|
|
||||||
FIX: Fix for goreleaser build action to align with changed ARM64 build path.
|
FIX: Fix for goreleaser build action to align with changed ARM64 build path.
|
||||||
|
@ -18,8 +18,7 @@ ARG ZITI_CTRL_ADVERTISED_PORT
|
|||||||
ARG ZITI_PWD
|
ARG ZITI_PWD
|
||||||
|
|
||||||
# render zrok controller config.yml
|
# render zrok controller config.yml
|
||||||
COPY ./envsubst.bash ./bootstrap-controller.bash /usr/local/bin/
|
COPY --chmod=0755 ./envsubst.bash ./bootstrap-controller.bash /usr/local/bin/
|
||||||
RUN chmod 0755 /usr/local/bin/envsubst.bash /usr/local/bin/bootstrap-controller.bash
|
|
||||||
COPY ./zrok-controller-config.yml.envsubst /tmp/
|
COPY ./zrok-controller-config.yml.envsubst /tmp/
|
||||||
RUN mkdir -p /etc/zrok-controller/
|
RUN mkdir -p /etc/zrok-controller/
|
||||||
RUN envsubst.bash \
|
RUN envsubst.bash \
|
||||||
|
@ -21,8 +21,7 @@ ARG ZROK_OAUTH_GITHUB_CLIENT_ID
|
|||||||
ARG ZROK_OAUTH_GITHUB_CLIENT_SECRET
|
ARG ZROK_OAUTH_GITHUB_CLIENT_SECRET
|
||||||
|
|
||||||
# render zrok frontend config.yml
|
# render zrok frontend config.yml
|
||||||
COPY ./envsubst.bash ./bootstrap-frontend.bash /usr/local/bin/
|
COPY --chmod=0755 ./envsubst.bash ./bootstrap-frontend.bash /usr/local/bin/
|
||||||
RUN chmod 0755 /usr/local/bin/envsubst.bash /usr/local/bin/bootstrap-frontend.bash
|
|
||||||
COPY ./zrok-frontend-config.yml.envsubst /tmp/
|
COPY ./zrok-frontend-config.yml.envsubst /tmp/
|
||||||
RUN mkdir -p /etc/zrok-frontend/
|
RUN mkdir -p /etc/zrok-frontend/
|
||||||
RUN envsubst.bash \
|
RUN envsubst.bash \
|
||||||
|
@ -31,7 +31,6 @@ RUN wget -qO- https://deb.nodesource.com/setup_18.x | bash \
|
|||||||
|
|
||||||
|
|
||||||
COPY --from=golang /usr/local/go /usr/local/go
|
COPY --from=golang /usr/local/go /usr/local/go
|
||||||
# RUN chmod -R go+rX ${go_path} ${go_cache}
|
|
||||||
|
|
||||||
COPY --from=goreleaser /usr/bin/goreleaser /usr/local/bin/goreleaser
|
COPY --from=goreleaser /usr/bin/goreleaser /usr/local/bin/goreleaser
|
||||||
|
|
||||||
|
@ -24,14 +24,10 @@ RUN mkdir -p -m0755 /licenses
|
|||||||
COPY ./LICENSE /licenses/apache.txt
|
COPY ./LICENSE /licenses/apache.txt
|
||||||
|
|
||||||
RUN mkdir -p /usr/local/bin
|
RUN mkdir -p /usr/local/bin
|
||||||
COPY ${ARTIFACTS_DIR}/${TARGETARCH}/${TARGETOS}/zrok \
|
COPY --chmod=0755 ${ARTIFACTS_DIR}/${TARGETARCH}/${TARGETOS}/zrok \
|
||||||
./nfpm/zrok-enable.bash \
|
./nfpm/zrok-enable.bash \
|
||||||
./nfpm/zrok-share.bash \
|
./nfpm/zrok-share.bash \
|
||||||
/usr/local/bin/
|
/usr/local/bin/
|
||||||
RUN chmod 0755 \
|
|
||||||
/usr/local/bin/zrok \
|
|
||||||
/usr/local/bin/zrok-enable.bash \
|
|
||||||
/usr/local/bin/zrok-share.bash
|
|
||||||
|
|
||||||
USER ziggy
|
USER ziggy
|
||||||
ENTRYPOINT [ "zrok" ]
|
ENTRYPOINT [ "zrok" ]
|
||||||
|
@ -1,9 +1,10 @@
|
|||||||
---
|
---
|
||||||
sidebar_position: 10
|
sidebar_position: 10
|
||||||
---
|
---
|
||||||
|
|
||||||
# Reserved Shares
|
# Reserved Shares
|
||||||
|
|
||||||
By default a `public` or `private` share is assigned a _share token_ when you create a share using the `zrok share` command. The `zrok share` command is the bridge between your local environment and the users you are sharing with. When you terminate the `zrok share`, the bridge is eliminated and the _share token_ is deleted. If you run `zrok share` again, you will be allocated a brand new _share token_.
|
By default, a `public` or `private` share is assigned a _share token_ when you create a share using the `zrok share` command. The `zrok share` command is the bridge between your local environment and the users you are sharing with. When you terminate the `zrok share`, the bridge is eliminated and the _share token_ is deleted. If you run `zrok share` again, you will be allocated a brand new _share token_.
|
||||||
|
|
||||||
You can use a `reserved` share to persist your _share token_ across multiple runs of the `zrok share` bridge. When you use a `reserved` share, the share token will not be deleted between multiple runs of `zrok share`.
|
You can use a `reserved` share to persist your _share token_ across multiple runs of the `zrok share` bridge. When you use a `reserved` share, the share token will not be deleted between multiple runs of `zrok share`.
|
||||||
|
|
||||||
@ -12,3 +13,19 @@ To use a `reserved` share, you will first run the `zrok reserve` command to crea
|
|||||||
This pattern works for both `public` and `private` shares, and for all resource types supported by `zrok`.
|
This pattern works for both `public` and `private` shares, and for all resource types supported by `zrok`.
|
||||||
|
|
||||||
To delete your `reserved` share use the `zrok release` command or click the delete button in the share's _Actions_ tab in the web console.
|
To delete your `reserved` share use the `zrok release` command or click the delete button in the share's _Actions_ tab in the web console.
|
||||||
|
|
||||||
|
## Unique Names
|
||||||
|
|
||||||
|
The default is to generate a random _share token_ and you may specify a _unique name_.
|
||||||
|
|
||||||
|
This reserves public share token "myshare."
|
||||||
|
|
||||||
|
```bash title="Reserve with the Command Line"
|
||||||
|
zrok reserve public 80 --unique-name "myshare"
|
||||||
|
```
|
||||||
|
|
||||||
|
This shares `127.0.0.1:80` as `https://myshare.zrok.example.com` where `https://{token}.zrok.example.com` is the frontend's template.
|
||||||
|
|
||||||
|
```bash title="Share a Reserved Token"
|
||||||
|
zrok share reserved "myshare"
|
||||||
|
```
|
||||||
|
@ -79,7 +79,7 @@ case $(uname -m) in
|
|||||||
;;
|
;;
|
||||||
aarch64|arm64) GOXARCH=arm64
|
aarch64|arm64) GOXARCH=arm64
|
||||||
;;
|
;;
|
||||||
arm*) GOXARCH=arm
|
arm*) GOXARCH=armv7
|
||||||
;;
|
;;
|
||||||
*) echo "ERROR: unknown arch '$(uname -m)'" >&2
|
*) echo "ERROR: unknown arch '$(uname -m)'" >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
Reference in New Issue
Block a user