Skip to content

Commit

Permalink
version bump sync with upstream, fix export issue
Browse files Browse the repository at this point in the history
  • Loading branch information
kmahyyg committed May 1, 2023
1 parent 6552fe0 commit 07302f6
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 12 deletions.
19 changes: 12 additions & 7 deletions .github/workflows/docker4commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
build-args: |
OVERLAY_S6_ARCH=${{ env.platform-tag }}
outputs: |
type=docker,dest=/tmp/build/out/ztncui-aio.tar
type=docker,dest=/tmp/build/out/ztncui-aio-${{ env.platform-tag }}.tar
push: false
provenance: false # attestation need to be disabled to merge later.
sbom: false # attestation need to be disabled to merge later.
Expand All @@ -85,7 +85,7 @@ jobs:
with:
retention-days: 30
name: ztncui-aio-${{ env.platform-tag }}-${{ github.sha }}
path: /tmp/build/out/ztncui-aio.tar
path: /tmp/build/out/ztncui-aio-${{ env.platform-tag }}.tar
- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
Expand Down Expand Up @@ -132,7 +132,7 @@ jobs:
build-args: |
OVERLAY_S6_ARCH=${{ env.platform-tag }}
outputs: |
type=docker,dest=/tmp/build/out/ztncui-aio.tar
type=docker,dest=/tmp/build/out/ztncui-aio-${{ env.platform-tag }}.tar
push: false
provenance: false # attestation need to be disabled to merge later.
sbom: false # attestation need to be disabled to merge later.
Expand All @@ -159,7 +159,7 @@ jobs:
with:
retention-days: 30
name: ztncui-aio-${{ env.platform-tag }}-${{ github.sha }}
path: /tmp/build/out/ztncui-aio.tar
path: /tmp/build/out/ztncui-aio-${{ env.platform-tag }}.tar
- name: Move cache
run: |
rm -rf /tmp/.buildx-cache
Expand Down Expand Up @@ -187,10 +187,15 @@ jobs:
docker manifest push ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
docker manifest create ghcr.io/${{ env.IMAGE_NAME }}:latest --amend ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 --amend ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-x86_64
docker manifest push ghcr.io/${{ env.IMAGE_NAME }}:latest
- name: Export Docker Image
- name: Download artifacts previously
uses: actions/download-artifact@v3
with:
path: /tmp/relbuild/${{ github.repository_owner }}
- name: Compress all artifacts using ZSTD
run: |
docker image save ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-aarch64 | gzip > /tmp/relbuild/${{ env.IMAGE_NAME }}-${{ github.ref_name }}-aarch64.tar.gz
docker image save ghcr.io/${{ env.IMAGE_NAME }}:${{ github.ref_name }}-x86_64 | gzip > /tmp/relbuild/${{ env.IMAGE_NAME }}-${{ github.ref_name }}-x86_64.tar.gz
cd /tmp/relbuild/${{ github.repository_owner }}
zstd -4 --rm ztncui-aio-aarch64.tar
zstd -4 --rm ztncui-aio-x86_64.tar
- name: Create Release and Upload DockerImage Assets In TarGZ
uses: Hs1r1us/[email protected]
env:
Expand Down
1 change: 0 additions & 1 deletion AIO_VERSION

This file was deleted.

34 changes: 31 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

![](https://github.com/kmahyyg/ztncui-aio/actions/workflows/docker4commit.yml/badge.svg)

Current Version: 20230501-1.10.6-0.8.13

## ZeroTier network controller user interface in a Docker container

This is to build a Docker image that contains **[ZeroTier One](https://www.zerotier.com/download.shtml)** and **[ztncui](https://key-networks.com/ztncui)** to set up a **standalone ZeroTier network controller** with a web user interface in a container.
Expand Down Expand Up @@ -47,9 +49,35 @@ Also, due to limitation of IPC of Zerotier-One UI and multiple issues, we do NOT
|:--------:|:--------:|:--------:|:--------:|
| no | AUTOGEN_PLANET | If set to 1, will use this node identity to generate a `planet` file and put to `httpfs` folder to serve it outside. If set to 2, will use config in `/etc/zt-mkworld/mkworld.config.json`. If set to 0, will do nothing. | 0 |

The reference config file can be found on `ztnodeid/assets/mkworld.conf.json`. `plRecommend` is used to mark to generate planetID and planetBirth timestamp.

You could also define yourself, and check the output to get C header of customized planet. After that, you will find the custom planet file under http file server root and also ca certificate.
The reference config file can be found on `ztnodeid/assets/mkworld.conf.json`.

You could also define yourself, and check the stdout output to get C header of customized planet. After that, you will find the custom planet file under http file server root and also ca certificate.

The configuration JSON can be understand like this:

```json
{
"rootNodes": [ // array of node, can be multiple
{
"comments": "amsterdam official", // node object, comment, will auto generate if AUTOGEN_PLANET=1
"identity": "992fcf1db7:0:206ed59350b31916f749a1f85dffb3a8787dcbf83b8c6e9448d4e3ea0e3369301be716c3609344a9d1533850fb4460c50af43322bcfc8e13d3301a1f1003ceb6",
// node identity.public ^^ , if node is not initialized, will initialize at the container start
"endpoints": [
"195.181.173.159/443", // node service location, in format: ip/port, will auto generate if AUTOGEN_PLANET=1
"2a02:6ea0:c024::/443" // must be less than or equal to two endpoints, one for IPv4, one for IPv6. if you have multiple IP, set multiple node with different identity.
]
}
],
"signing": [
"previous.c25519", // planet signing key, if not exist, will generate
"current.c25519" // same, used for iteration and update
],
"output": "planet.custom", // output filename
"plID": 0, // planet numeric ID, if you don't know, do not modify, and set plRecommend to true
"plBirth": 0, // planet creation timestamp, if you don't know, do not modify, and set plRecommend to true
"plRecommend": true // set plRecommend to true, auto-recommend plID, plBirth value. For more details, read mkworld source code in zerotier-one official repo
}
```

### Docker image

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.2.8
1.2.14

0 comments on commit 07302f6

Please sign in to comment.