extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2024-11-24 00:54:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renaming project builds and including new Icons (#318)

Browse Source 
Added MacOS icons, plist, and cask template file

Adjusted goreleaser with the new name for all builds

Added Icon and update windows-ui build to include it and avoid console

migrated Docker builds to new namespace netbirdio
This commit is contained in:
Maycon Santos 2022-05-21 18:42:56 +02:00 committed by GitHub
parent 3eb230e1a0
commit e334e8db53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 214 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
.github/workflows/release.yml vendored
View File

@ -8,6 +8,9 @@ on:
- main - main
pull_request: pull_request:
env:
SIGN_PIPE_VER: main
jobs: jobs:
release: release:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -48,10 +51,18 @@ jobs:
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/login-action@v1 uses: docker/login-action@v1
with: with:
username: ${{ secrets.DOCKER_USER }} username: netbirdio
password: ${{ secrets.DOCKER_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}
- name: Install dependencies - name: Install dependencies
run: sudo apt update && sudo apt install -y -q libgtk-3-dev libappindicator3-dev libayatana-appindicator3-dev libgl1-mesa-dev xorg-dev gcc-mingw-w64-x86-64 run: sudo apt update && sudo apt install -y -q libgtk-3-dev libappindicator3-dev libayatana-appindicator3-dev libgl1-mesa-dev xorg-dev gcc-mingw-w64-x86-64
- name: Install rsrc
run: go install github.com/akavel/rsrc@v0.10.2
- name: Generate windows rsrc
run: rsrc -arch amd64 -ico client/ui/netbird.ico -manifest client/ui/manifest.xml -o client/ui/resources_windows_amd64.syso
- -
name: Run GoReleaser name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2 uses: goreleaser/goreleaser-action@v2
@ -63,15 +74,14 @@ jobs:
HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }} HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
UPLOAD_DEBIAN_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} UPLOAD_DEBIAN_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }}
UPLOAD_YUM_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} UPLOAD_YUM_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }}
- -
name: Trigger Windows binaries sign pipeline name: Trigger Windows binaries sign pipeline
uses: benc-uk/workflow-dispatch@v1 uses: benc-uk/workflow-dispatch@v1
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
with: with:
workflow: Sign windows bin and installer workflow: Sign windows bin and installer
repo: wiretrustee/windows-sign-pipeline repo: netbirdio/sign-pipelines
ref: v0.0.2 ref: ${{ env.SIGN_PIPE_VER }}
token: ${{ secrets.SIGN_GITHUB_TOKEN }} token: ${{ secrets.SIGN_GITHUB_TOKEN }}
inputs: '{ "tag": "${{ github.ref }}" }' inputs: '{ "tag": "${{ github.ref }}" }'
- -
@ -108,15 +118,25 @@ jobs:
run: go mod tidy run: go mod tidy
- -
name: Run GoReleaser name: Run GoReleaser
id: goreleaser
uses: goreleaser/goreleaser-action@v2 uses: goreleaser/goreleaser-action@v2
with: with:
version: v1.6.3 version: v1.6.3
args: release --config .goreleaser_ui_darwin.yaml --rm-dist args: release --config .goreleaser_ui_darwin.yaml --rm-dist
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
UPLOAD_DEBIAN_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} -
UPLOAD_YUM_SECRET: ${{ secrets.PKG_UPLOAD_SECRET }} name: Trigger Darwin App binaries sign pipeline
uses: benc-uk/workflow-dispatch@v1
if: startsWith(github.ref, 'refs/tags/')
with:
workflow: Sign darwin ui app
repo: netbirdio/sign-pipelines
ref: ${{ env.SIGN_PIPE_VER }}
token: ${{ secrets.SIGN_GITHUB_TOKEN }}
inputs: '{ "tag": "${{ github.ref }}" }'
- -
name: upload non tags for debug purposes name: upload non tags for debug purposes
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2

181
.goreleaser.yaml
View File

@ -1,8 +1,8 @@
project_name: wiretrustee project_name: netbird
builds: builds:
- id: wiretrustee - id: netbird
dir: client dir: client
binary: wiretrustee binary: netbird
env: [CGO_ENABLED=0] env: [CGO_ENABLED=0]
goos: goos:
- linux - linux
@ -55,9 +55,9 @@ builds:
- -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser - -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
mod_timestamp: '{{ .CommitTimestamp }}' mod_timestamp: '{{ .CommitTimestamp }}'
- id: wiretrustee-ui - id: netbird-ui
dir: client/ui dir: client/ui
binary: wiretrustee-ui binary: netbird-ui
env: env:
- CGO_ENABLED=1 - CGO_ENABLED=1
goos: goos:
@ -68,9 +68,9 @@ builds:
- -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser - -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
mod_timestamp: '{{ .CommitTimestamp }}' mod_timestamp: '{{ .CommitTimestamp }}'
- id: wiretrustee-ui-windows - id: netbird-ui-windows
dir: client/ui dir: client/ui
binary: wiretrustee-ui-windows binary: netbird-ui
env: env:
- CGO_ENABLED=1 - CGO_ENABLED=1
- CC=x86_64-w64-mingw32-gcc - CC=x86_64-w64-mingw32-gcc
@ -80,23 +80,50 @@ builds:
- amd64 - amd64
ldflags: ldflags:
- -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser - -s -w -X github.com/netbirdio/netbird/client/ui/system.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.CommitDate}} -X main.builtBy=goreleaser
- -H windowsgui
mod_timestamp: '{{ .CommitTimestamp }}' mod_timestamp: '{{ .CommitTimestamp }}'
archives: archives:
- builds: - builds:
- wiretrustee - netbird
- id: linux-arch
name_template: "{{ .ProjectName }}-ui-linux_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
builds:
- netbird-ui
- id: windows-arch
name_template: "{{ .ProjectName }}-ui-windows_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
builds:
- netbird-ui-windows
nfpms: nfpms:
- maintainer: Wiretrustee <dev@wiretrustee.com> - maintainer: Netbird <dev@netbird.io>
description: Wiretrustee client UI. description: Netbird client UI.
homepage: https://wiretrustee.com/ homepage: https://netbird.io/
id: wiretrustee-ui-deb id: netbird-ui-deb
package_name: wiretrustee-ui package_name: netbird-ui
builds: builds:
- wiretrustee-ui - netbird-ui
formats: formats:
- deb - deb
contents:
- src: client/ui/netbird.desktop
dst: /usr/share/applications/netbird.desktop
- src: client/ui/disconnected.png
dst: /usr/share/pixmaps/netbird.png
dependencies:
- libayatana-appindicator3-1
- libgtk-3-dev
- libappindicator3-dev
- maintainer: Netbird <dev@netbird.io>
description: Netbird client UI.
homepage: https://netbird.io/
id: netbird-ui-rpm
package_name: netbird-ui
builds:
- netbird-ui
formats:
- rpm - rpm
contents: contents:
- src: client/ui/netbird.desktop - src: client/ui/netbird.desktop
@ -108,13 +135,13 @@ nfpms:
- libgtk-3-dev - libgtk-3-dev
- libappindicator3-dev - libappindicator3-dev
- maintainer: Wiretrustee <dev@wiretrustee.com> - maintainer: Netbird <dev@netbird.io>
description: Wiretrustee client. description: Netbird client.
homepage: https://wiretrustee.com/ homepage: https://netbird.io/
id: wiretrustee-deb id: netbird-deb
bindir: /usr/bin bindir: /usr/bin
builds: builds:
- wiretrustee - netbird
formats: formats:
- deb - deb
@ -122,13 +149,13 @@ nfpms:
postinstall: "release_files/post_install.sh" postinstall: "release_files/post_install.sh"
preremove: "release_files/pre_remove.sh" preremove: "release_files/pre_remove.sh"
- maintainer: Wiretrustee <dev@wiretrustee.com> - maintainer: Netbird <dev@netbird.io>
description: Wiretrustee client. description: Netbird client.
homepage: https://wiretrustee.com/ homepage: https://netbird.io/
id: wiretrustee-rpm id: netbird-rpm
bindir: /usr/bin bindir: /usr/bin
builds: builds:
- wiretrustee - netbird
formats: formats:
- rpm - rpm
@ -137,9 +164,9 @@ nfpms:
preremove: "release_files/pre_remove.sh" preremove: "release_files/pre_remove.sh"
dockers: dockers:
- image_templates: - image_templates:
- wiretrustee/wiretrustee:{{ .Version }}-amd64 - netbirdio/netbird:{{ .Version }}-amd64
ids: ids:
- wiretrustee - netbird
goarch: amd64 goarch: amd64
use: buildx use: buildx
dockerfile: client/Dockerfile dockerfile: client/Dockerfile
@ -150,11 +177,11 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}"
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=wiretrustee@wiretrustee.com" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- wiretrustee/wiretrustee:{{ .Version }}-arm64v8 - netbirdio/netbird:{{ .Version }}-arm64v8
ids: ids:
- wiretrustee - netbird
goarch: arm64 goarch: arm64
use: buildx use: buildx
dockerfile: client/Dockerfile dockerfile: client/Dockerfile
@ -165,11 +192,11 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}"
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=wiretrustee@wiretrustee.com" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- wiretrustee/wiretrustee:{{ .Version }}-arm - netbirdio/netbird:{{ .Version }}-arm
ids: ids:
- wiretrustee - netbird
goarch: arm goarch: arm
goarm: 6 goarm: 6
use: buildx use: buildx
@ -181,7 +208,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=org.opencontainers.image.revision={{.FullCommit}}" - "--label=org.opencontainers.image.revision={{.FullCommit}}"
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=wiretrustee@wiretrustee.com" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbirdio/signal:{{ .Version }}-amd64 - netbirdio/signal:{{ .Version }}-amd64
ids: ids:
@ -198,7 +225,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/signal:{{ .Version }}-arm64v8 - netbirdio/signal:{{ .Version }}-arm64v8
ids: ids:
- netbird-signal - netbird-signal
goarch: arm64 goarch: arm64
@ -213,7 +240,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/signal:{{ .Version }}-arm - netbirdio/signal:{{ .Version }}-arm
ids: ids:
- netbird-signal - netbird-signal
goarch: arm goarch: arm
@ -229,7 +256,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/management:{{ .Version }}-amd64 - netbirdio/management:{{ .Version }}-amd64
ids: ids:
- netbird-mgmt - netbird-mgmt
goarch: amd64 goarch: amd64
@ -244,7 +271,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/management:{{ .Version }}-arm64v8 - netbirdio/management:{{ .Version }}-arm64v8
ids: ids:
- netbird-mgmt - netbird-mgmt
goarch: arm64 goarch: arm64
@ -259,7 +286,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/management:{{ .Version }}-arm - netbirdio/management:{{ .Version }}-arm
ids: ids:
- netbird-mgmt - netbird-mgmt
goarch: arm goarch: arm
@ -275,7 +302,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/management:{{ .Version }}-debug-amd64 - netbirdio/management:{{ .Version }}-debug-amd64
ids: ids:
- netbird-mgmt - netbird-mgmt
goarch: amd64 goarch: amd64
@ -290,7 +317,7 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/management:{{ .Version }}-debug-arm64v8 - netbirdio/management:{{ .Version }}-debug-arm64v8
ids: ids:
- netbird-mgmt - netbird-mgmt
goarch: arm64 goarch: arm64
@ -306,7 +333,7 @@ dockers:
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
- image_templates: - image_templates:
- netbird/management:{{ .Version }}-debug-arm - netbirdio/management:{{ .Version }}-debug-arm
ids: ids:
- netbird-mgmt - netbird-mgmt
goarch: arm goarch: arm
@ -322,60 +349,62 @@ dockers:
- "--label=org.opencontainers.image.version={{.Version}}" - "--label=org.opencontainers.image.version={{.Version}}"
- "--label=maintainer=dev@netbird.io" - "--label=maintainer=dev@netbird.io"
docker_manifests: docker_manifests:
- name_template: wiretrustee/wiretrustee:{{ .Version }} - name_template: netbirdio/netbird:{{ .Version }}
image_templates: image_templates:
- wiretrustee/wiretrustee:{{ .Version }}-arm64v8 - netbirdio/netbird:{{ .Version }}-arm64v8
- wiretrustee/wiretrustee:{{ .Version }}-arm - netbirdio/netbird:{{ .Version }}-arm
- wiretrustee/wiretrustee:{{ .Version }}-amd64 - netbirdio/netbird:{{ .Version }}-amd64
- name_template: wiretrustee/wiretrustee:latest - name_template: netbirdio/netbird:latest
image_templates: image_templates:
- wiretrustee/wiretrustee:{{ .Version }}-arm64v8 - netbirdio/netbird:{{ .Version }}-arm64v8
- wiretrustee/wiretrustee:{{ .Version }}-arm - netbirdio/netbird:{{ .Version }}-arm
- wiretrustee/wiretrustee:{{ .Version }}-amd64 - netbirdio/netbird:{{ .Version }}-amd64
- name_template: netbird/signal:{{ .Version }} - name_template: netbirdio/signal:{{ .Version }}
image_templates: image_templates:
- netbird/signal:{{ .Version }}-arm64v8 - netbirdio/signal:{{ .Version }}-arm64v8
- netbird/signal:{{ .Version }}-arm - netbirdio/signal:{{ .Version }}-arm
- netbird/signal:{{ .Version }}-amd64 - netbirdio/signal:{{ .Version }}-amd64
- name_template: netbird/signal:latest - name_template: netbirdio/signal:latest
image_templates: image_templates:
- netbird/signal:{{ .Version }}-arm64v8 - netbirdio/signal:{{ .Version }}-arm64v8
- netbird/signal:{{ .Version }}-arm - netbirdio/signal:{{ .Version }}-arm
- netbird/signal:{{ .Version }}-amd64 - netbirdio/signal:{{ .Version }}-amd64
- name_template: netbird/management:{{ .Version }} - name_template: netbirdio/management:{{ .Version }}
image_templates: image_templates:
- netbird/management:{{ .Version }}-arm64v8 - netbirdio/management:{{ .Version }}-arm64v8
- netbird/management:{{ .Version }}-arm - netbirdio/management:{{ .Version }}-arm
- netbird/management:{{ .Version }}-amd64 - netbirdio/management:{{ .Version }}-amd64
- name_template: netbird/management:latest - name_template: netbirdio/management:latest
image_templates: image_templates:
- netbird/management:{{ .Version }}-arm64v8 - netbirdio/management:{{ .Version }}-arm64v8
- netbird/management:{{ .Version }}-arm - netbirdio/management:{{ .Version }}-arm
- netbird/management:{{ .Version }}-amd64 - netbirdio/management:{{ .Version }}-amd64
- name_template: netbird/management:debug-latest - name_template: netbirdio/management:debug-latest
image_templates: image_templates:
- netbird/management:{{ .Version }}-debug-arm64v8 - netbirdio/management:{{ .Version }}-debug-arm64v8
- netbird/management:{{ .Version }}-debug-arm - netbirdio/management:{{ .Version }}-debug-arm
- netbird/management:{{ .Version }}-debug-amd64 - netbirdio/management:{{ .Version }}-debug-amd64
brews: brews:
- -
ids:
- default
tap: tap:
owner: wiretrustee owner: netbirdio
name: homebrew-client name: homebrew-tap
token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}" token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
commit_author: commit_author:
name: Wiretrustee name: Netbird
email: wiretrustee@wiretrustee.com email: dev@netbird.io
description: Wiretrustee project. description: Netbird project.
download_strategy: CurlDownloadStrategy download_strategy: CurlDownloadStrategy
homepage: https://wiretrustee.com/ homepage: https://netbird.io/
license: "BSD3" license: "BSD3"
test: | test: |
system "#{bin}/{{ .ProjectName }} -h" system "#{bin}/{{ .ProjectName }} -h"
@ -384,6 +413,7 @@ uploads:
- name: debian - name: debian
ids: ids:
- deb - deb
- netbird-ui-deb
mode: archive mode: archive
target: https://pkgs.wiretrustee.com/debian/pool/{{ .ArtifactName }};deb.distribution=stable;deb.component=main;deb.architecture={{ if .Arm }}armhf{{ else }}{{ .Arch }}{{ end }};deb.package= target: https://pkgs.wiretrustee.com/debian/pool/{{ .ArtifactName }};deb.distribution=stable;deb.component=main;deb.architecture={{ if .Arm }}armhf{{ else }}{{ .Arch }}{{ end }};deb.package=
username: dev@wiretrustee.com username: dev@wiretrustee.com
@ -391,6 +421,7 @@ uploads:
- name: yum - name: yum
ids: ids:
- rpm - rpm
- netbird-ui-rpm
mode: archive mode: archive
target: https://pkgs.wiretrustee.com/yum/{{ .Arch }}{{ if .Arm }}{{ .Arm }}{{ end }} target: https://pkgs.wiretrustee.com/yum/{{ .Arch }}{{ if .Arm }}{{ .Arm }}{{ end }}
username: dev@wiretrustee.com username: dev@wiretrustee.com

23
.goreleaser_ui_darwin.yaml
View File

@ -1,8 +1,8 @@
project_name: wiretrustee-ui project_name: netbird-ui
builds: builds:
- id: wiretrustee-ui-darwin - id: netbird-ui-darwin
dir: client/ui dir: client/ui
binary: wiretrustee-ui binary: netbird-ui
env: [CGO_ENABLED=1] env: [CGO_ENABLED=1]
goos: goos:
@ -21,18 +21,7 @@ builds:
archives: archives:
- builds: - builds:
- wiretrustee-ui-darwin - netbird-ui-darwin
brews: changelog:
- skip: true
tap:
owner: wiretrustee
name: homebrew-client
token: "{{ .Env.HOMEBREW_TAP_GITHUB_TOKEN }}"
commit_author:
name: Wiretrustee
email: wiretrustee@wiretrustee.com
description: Wiretrustee project.
download_strategy: CurlDownloadStrategy
homepage: https://wiretrustee.com/
license: "BSD3"

4
client/Dockerfile
View File

@ -1,4 +1,4 @@
FROM gcr.io/distroless/base:debug FROM gcr.io/distroless/base:debug
ENV WT_LOG_FILE=console ENV WT_LOG_FILE=console
ENTRYPOINT [ "/go/bin/wiretrustee","up"] ENTRYPOINT [ "/go/bin/netbird","up"]
COPY wiretrustee /go/bin/wiretrustee COPY netbird /go/bin/netbird

30
client/installer.nsis
View File

@ -1,12 +1,12 @@
!define APP_NAME "Wiretrustee" !define APP_NAME "Netbird"
!define COMP_NAME "Wiretrustee" !define COMP_NAME "Netbird"
!define WEB_SITE "wiretrustee.com" !define WEB_SITE "Netbird.io"
!define VERSION $%APPVER% !define VERSION $%APPVER%
!define COPYRIGHT "Wiretrustee Authors, 2021" !define COPYRIGHT "Netbird Authors, 2021"
!define DESCRIPTION "A WireGuard®-based mesh network that connects your devices into a single private network" !define DESCRIPTION "A WireGuard®-based mesh network that connects your devices into a single private network"
!define INSTALLER_NAME "wiretrustee-installer.exe" !define INSTALLER_NAME "netbird-installer.exe"
!define MAIN_APP_EXE "Wiretrustee" !define MAIN_APP_EXE "Netbird"
!define ICON "ui\\wiretrustee.ico" !define ICON "ui\\netbird.ico"
!define BANNER "ui\\banner.bmp" !define BANNER "ui\\banner.bmp"
!define LICENSE_DATA "..\\LICENSE" !define LICENSE_DATA "..\\LICENSE"
@ -16,8 +16,8 @@
!define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}" !define REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${MAIN_APP_EXE}"
!define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}" !define UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APP_NAME}"
!define UI_APP_NAME "Wiretrustee UI" !define UI_APP_NAME "Netbird UI"
!define UI_APP_EXE "Wiretrustee-ui" !define UI_APP_EXE "Netbird-ui"
!define UI_REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${UI_APP_EXE}" !define UI_REG_APP_PATH "Software\Microsoft\Windows\CurrentVersion\App Paths\${UI_APP_EXE}"
!define UI_UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UI_APP_NAME}" !define UI_UNINSTALL_PATH "Software\Microsoft\Windows\CurrentVersion\Uninstall\${UI_APP_NAME}"
@ -83,8 +83,7 @@ Section -MainProgram
${INSTALL_TYPE} ${INSTALL_TYPE}
SetOverwrite ifnewer SetOverwrite ifnewer
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File /r "..\\dist\\wiretrustee_windows_amd64\\" File /r "..\\dist\\netbird_windows_amd64\\"
File /r "..\\dist\\wiretrustee-ui_windows_amd64\\"
SectionEnd SectionEnd
@ -92,18 +91,18 @@ SectionEnd
Section -Icons_Reg Section -Icons_Reg
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
WriteUninstaller "$INSTDIR\wiretrustee_uninstall.exe" WriteUninstaller "$INSTDIR\netbird_uninstall.exe"
WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" WriteRegStr ${REG_ROOT} "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "${APP_NAME}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\wiretrustee_uninstall.exe" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\netbird_uninstall.exe"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${MAIN_APP_EXE}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" WriteRegStr ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "${COMP_NAME}"
WriteRegStr ${REG_ROOT} "${UI_REG_APP_PATH}" "" "$INSTDIR\${UI_APP_EXE}" WriteRegStr ${REG_ROOT} "${UI_REG_APP_PATH}" "" "$INSTDIR\${UI_APP_EXE}"
WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayName" "${UI_APP_NAME}" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayName" "${UI_APP_NAME}"
WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "UninstallString" "$INSTDIR\wiretrustee_uninstall.exe" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "UninstallString" "$INSTDIR\netbird_uninstall.exe"
WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${UI_APP_EXE}" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayIcon" "$INSTDIR\${UI_APP_EXE}"
WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayVersion" "${VERSION}" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "DisplayVersion" "${VERSION}"
WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "Publisher" "${COMP_NAME}" WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "Publisher" "${COMP_NAME}"
@ -111,6 +110,9 @@ WriteRegStr ${REG_ROOT} "${UI_UNINSTALL_PATH}" "Publisher" "${COMP_NAME}"
EnVar::SetHKLM EnVar::SetHKLM
EnVar::AddValueEx "path" "$INSTDIR" EnVar::AddValueEx "path" "$INSTDIR"
CreateShortCut "${SMPROGRAMS}\${UI_APP_NAME}.lnk" "$INSTDIR\${UI_APP_EXE}"
CreateShortCut "${DESKTOP}\${UI_APP_NAME}.lnk" "$INSTDIR\${UI_APP_EXE}"
Exec '"$INSTDIR\${MAIN_APP_EXE}" service install' Exec '"$INSTDIR\${MAIN_APP_EXE}" service install'
Exec '"$INSTDIR\${MAIN_APP_EXE}" service start' Exec '"$INSTDIR\${MAIN_APP_EXE}" service start'
# sleep a bit for visibility # sleep a bit for visibility

4
client/manifest.xml
View File

@ -3,10 +3,10 @@
<assemblyIdentity <assemblyIdentity
version="0.0.0.1" version="0.0.0.1"
processorArchitecture="*" processorArchitecture="*"
name="wiretrustee.exe" name="netbird.exe"
type="win32" type="win32"
/> />
<description>Wiretrustee application</description> <description>Netbird application</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3"> <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security> <security>
<requestedPrivileges> <requestedPrivileges>

2
client/resources.rc
View File

@ -5,5 +5,5 @@
#define STRINGIZE(x) #x #define STRINGIZE(x) #x
#define EXPAND(x) STRINGIZE(x) #define EXPAND(x) STRINGIZE(x)
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST manifest.xml CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST manifest.xml
7 ICON ui/wiretrustee.ico 7 ICON ui/netbird.ico
wireguard.dll RCDATA wireguard.dll wireguard.dll RCDATA wireguard.dll

12
client/ui/Info.plist Normal file
View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleExecutable</key>
<string>netbird-ui</string>
<key>CFBundleIconFile</key>
<string>Netbird</string>
<key>LSUIElement</key>
<string>1</string>
</dict>
</plist>

BIN
client/ui/Netbird.icns Normal file
View File

Binary file not shown.

17
client/ui/manifest.xml Normal file
View File

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.0.0.1"
processorArchitecture="*"
name="netbird-ui.exe"
type="win32"
/>
<description>Netbird UI application</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"/>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>

21
client/ui/netbird-ui.rb.tmpl Normal file
View File

@ -0,0 +1,21 @@
{{ $projectName := env.Getenv "PROJECT" }}{{ $amdFilePath := env.Getenv "AMD" }}{{ $armFilePath := env.Getenv "ARM" }}
{{ $amdURL := env.Getenv "AMD_URL" }}{{ $armURL := env.Getenv "ARM_URL" }}
{{ $amdFile := filepath.Base $amdFilePath }}{{ $armFile := filepath.Base $armFilePath }}{{ $amdFileBytes := file.Read $amdFilePath }}
{{ $armFileBytes := file.Read $armFilePath }}# Netbird's UI Client Cask Formula
cask "{{ $projectName }}" do
version "{{ env.Getenv "VERSION" }}"
if Hardware::CPU.intel?
url "{{ $amdURL }}"
sha256 "{{ crypto.SHA256 $amdFileBytes }}"
app "netbird_ui_darwin_amd64", target: "Netbird UI.app"
else
url "{{ $armURL }}"
sha256 "{{ crypto.SHA256 $armFileBytes }}"
app "netbird_ui_darwin_arm64", target: "Netbird UI.app"
end
name "Netbird UI"
desc "Netbird UI Client"
homepage "https://www.netbird.io/"
end

2
client/ui/netbird.desktop
View File

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=Netbird Agent Name=Netbird Agent
Exec=/usr/bin/wiretrustee-ui Exec=/usr/bin/netbird-ui
Icon=netbird Icon=netbird
Type=Application Type=Application
Terminal=false Terminal=false

BIN
client/ui/netbird.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 104 KiB

BIN
client/ui/wiretrustee.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 99 KiB