Merge branch 'main' into renovate/major-tailwindcss-monorepo

Author: pmig

.env.development.local

@@ -16,6 +16,7 @@ MAILER_SMTP_PORT=1025
 # AGENT_INTERVAL=1m
 # AGENT_DOCKER_CONFIG='{"auths":{"https://index.docker.io/v1/":{"username":"xxx","password":"xxx"}}}'
 STATUS_ENTRIES_MAX_AGE=1h
+# USER_EMAIL_VERIFICATION_REQUIRED=false
 
 # sentry config
 # SENTRY_DSN="https://ef0c6d7ca9b61d227dafefaaf3199901@o4508443344633856.ingest.de.sentry.io/4508443371569232"

.github/workflows/build-agent.yaml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   build-agent:
-    timeout-minutes: 5
+    timeout-minutes: 20
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -36,7 +36,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
       - name: Generate Docker Metadata
         id: meta
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
@@ -52,6 +52,7 @@ jobs:
       - name: Docker build (push only for tag)
         uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
         with:
+          platforms: linux/amd64,linux/arm64
           file: Dockerfile.${{ matrix.agent }}
           build-args: |
             COMMIT=${{ steps.generate.outputs.sha_short }}

.github/workflows/build-chart.yaml

@@ -31,7 +31,7 @@ jobs:
       - name: Build helm chart
         run: |
           helm dependency build deploy/charts/distr
-          helm lint deploy/charts/distr
+          helm lint --strict deploy/charts/distr
           helm package deploy/charts/distr
       - name: Login to GitHub Container Registry (tag or manual only)
         if: ${{ startsWith(github.ref, 'refs/tags/') || inputs.publish }}

.github/workflows/build-hub.yaml

@@ -41,7 +41,7 @@ jobs:
       - name: Lint with prettier
         run: npm run lint
       - name: Lint with golangci-lint
-        uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
+        uses: golangci/golangci-lint-action@e60da84bfae8c7920a47be973d75e15710aa8bd7 # v6.3.0
         with:
           version: latest
 
@@ -74,7 +74,7 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
+        uses: docker/setup-buildx-action@f7ce87c1d6bead3e36075b2ce75da1f6cc28aaca # v3.9.0
       - name: Generate Docker Metadata
         id: meta
         uses: docker/metadata-action@369eb591f429131d6889c46b94e711f089e6ca96 # v5.6.1
@@ -90,6 +90,7 @@ jobs:
       - name: Docker build (push on tag only)
         uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           file: Dockerfile.hub
           push: ${{ startsWith(github.ref, 'refs/tags/') }}

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.0.0"
+  ".": "1.1.2"
 }

CHANGELOG.md

@@ -1,5 +1,133 @@
 # Changelog
 
+## [1.1.2](https://github.com/glasskube/distr/compare/1.1.1...1.1.2) (2025-02-07)
+
+
+### Bug Fixes
+
+* **docker-agent:** keep same docker config after self-update ([#440](https://github.com/glasskube/distr/issues/440)) ([e2619e5](https://github.com/glasskube/distr/commit/e2619e53f68a966a32f0491bcd899ab7974d1bb0))
+
+
+### Other
+
+* make customer managed environment manageable for vendor ([#439](https://github.com/glasskube/distr/issues/439)) ([8b634a9](https://github.com/glasskube/distr/commit/8b634a9555d4a5f3177e479e3f9d0512188166e5))
+
+## [1.1.1](https://github.com/glasskube/distr/compare/1.1.0...1.1.1) (2025-02-06)
+
+
+### Bug Fixes
+
+* **deps:** update angular monorepo to v19.1.5 ([#437](https://github.com/glasskube/distr/issues/437)) ([c435fe1](https://github.com/glasskube/distr/commit/c435fe172c17b49e30e71c2c92e0618c1a7af338))
+
+
+### Docs
+
+* add register note ([7418bce](https://github.com/glasskube/distr/commit/7418bce7640b08a837be1350ce105b592fb965c5))
+* format readme ([5c5791d](https://github.com/glasskube/distr/commit/5c5791d700637fe0a2cbbe11a9e15f9832ab9101))
+
+## [1.1.0](https://github.com/glasskube/distr/compare/1.0.4...1.1.0) (2025-02-06)
+
+
+### Features
+
+* add showing invite URL after user creation ([#427](https://github.com/glasskube/distr/issues/427)) ([7570373](https://github.com/glasskube/distr/commit/7570373a21adfac900b9d7345c94c7134604b424))
+* **docker-agent:** add self-updating (existing agents must be re-deployed) ([#425](https://github.com/glasskube/distr/issues/425)) ([bab6934](https://github.com/glasskube/distr/commit/bab6934a401a1399b45cefd4ecb9a35cbbd5ce8d))
+* support environment for docker compose ([#424](https://github.com/glasskube/distr/issues/424)) ([7b8812b](https://github.com/glasskube/distr/commit/7b8812b11399c2d36258ac1721836bce24cda61d))
+
+
+### Bug Fixes
+
+* **backend:** avoid panic on empty compose file ([#423](https://github.com/glasskube/distr/issues/423)) ([6403124](https://github.com/glasskube/distr/commit/6403124df1aa0a89934b1f00db51b62ab9065e93))
+* **backend:** avoid struct parsing error after update statement ([#420](https://github.com/glasskube/distr/issues/420)) ([ddf1d44](https://github.com/glasskube/distr/commit/ddf1d4453510bc263c5b5eebd932958404c8200d))
+* **deps:** update aws-sdk-go-v2 monorepo ([#429](https://github.com/glasskube/distr/issues/429)) ([7312439](https://github.com/glasskube/distr/commit/7312439540ce5a05b693757b91986214630d654e))
+* **deps:** update dependency @angular/cdk to v19.1.3 ([#428](https://github.com/glasskube/distr/issues/428)) ([6c75a3d](https://github.com/glasskube/distr/commit/6c75a3dea2266edaf85da15b27c8b898b2bae4f1))
+* **deps:** update dependency globe.gl to v2.39.7 ([#432](https://github.com/glasskube/distr/issues/432)) ([c22322e](https://github.com/glasskube/distr/commit/c22322ef8642c5a5542f6107070bed7c757b3646))
+* **deps:** update dependency posthog-js to v1.215.3 ([#416](https://github.com/glasskube/distr/issues/416)) ([cc8ee90](https://github.com/glasskube/distr/commit/cc8ee900fd78cab791889a697593ded6f8956e98))
+* **deps:** update dependency posthog-js to v1.215.5 ([#430](https://github.com/glasskube/distr/issues/430)) ([32eae8f](https://github.com/glasskube/distr/commit/32eae8f7d34325a6dee2e82d94481df2adaae431))
+* **deps:** update module github.com/aws/aws-sdk-go-v2/config to v1.29.5 ([#422](https://github.com/glasskube/distr/issues/422)) ([266b56f](https://github.com/glasskube/distr/commit/266b56f91814ead9ca50f711037be65e9325a3ec))
+
+
+### Other
+
+* allow disabling email verification ([#426](https://github.com/glasskube/distr/issues/426)) ([97301ac](https://github.com/glasskube/distr/commit/97301acf5886813ff77226e87f0812b630fba181))
+* **deps:** update angular-cli monorepo to v19.1.6 ([#431](https://github.com/glasskube/distr/issues/431)) ([e24076c](https://github.com/glasskube/distr/commit/e24076c03cf3e8443ce0e76b2d88531c649efa02))
+* **deps:** update axllent/mailpit docker tag to v1.22.1 ([#433](https://github.com/glasskube/distr/issues/433)) ([b757541](https://github.com/glasskube/distr/commit/b757541cd512996686e88f1d38f6182f082f7d60))
+* **deps:** update docker/setup-buildx-action action to v3.9.0 ([#434](https://github.com/glasskube/distr/issues/434)) ([55e9397](https://github.com/glasskube/distr/commit/55e9397c6e021871a216845496e358cd586d37cf))
+* **deps:** update golangci/golangci-lint-action action to v6.3.0 ([#421](https://github.com/glasskube/distr/issues/421)) ([d991b87](https://github.com/glasskube/distr/commit/d991b871a122a8c70fbcdf339d78f3936da6e39b))
+* mount host docker config directory ([#435](https://github.com/glasskube/distr/issues/435)) ([13b2dd7](https://github.com/glasskube/distr/commit/13b2dd7b5e969de63a0e372d5e7551e4bace4adf))
+
+
+### Docs
+
+* link to register endpoint ([fd551b6](https://github.com/glasskube/distr/commit/fd551b64a77a036d3f64182a895c3e4760b860db))
+
+## [1.0.4](https://github.com/glasskube/distr/compare/1.0.3...1.0.4) (2025-02-04)
+
+
+### Other
+
+* remove console logs ([#417](https://github.com/glasskube/distr/issues/417)) ([9033385](https://github.com/glasskube/distr/commit/90333858fa34a0d65ed6fb60da49de67d42c45bf))
+
+## [1.0.3](https://github.com/glasskube/distr/compare/1.0.2...1.0.3) (2025-02-04)
+
+
+### Bug Fixes
+
+* **deps:** update module github.com/go-chi/chi/v5 to v5.2.1 ([#413](https://github.com/glasskube/distr/issues/413)) ([3b7ab5d](https://github.com/glasskube/distr/commit/3b7ab5d53f2f730ee240d67057849d88eb65414a))
+
+
+### Other
+
+* **ci:** fix release build error ([#414](https://github.com/glasskube/distr/issues/414)) ([9bfc472](https://github.com/glasskube/distr/commit/9bfc4729d9259ffcff72bfa6e60271974748d9a4))
+
+## [1.0.2](https://github.com/glasskube/distr/compare/1.0.1...1.0.2) (2025-02-04)
+
+
+### Bug Fixes
+
+* **deps:** update dependency @codemirror/state to v6.5.2 ([#405](https://github.com/glasskube/distr/issues/405)) ([92933ff](https://github.com/glasskube/distr/commit/92933ff34fb110baa7619333b56da1e54ffe9793))
+* **deps:** update dependency @sentry/angular to v8.54.0 ([#406](https://github.com/glasskube/distr/issues/406)) ([d2d4795](https://github.com/glasskube/distr/commit/d2d47959c0639ff7a3fcb89e138c17ec2e6bbcbf))
+* **deps:** update dependency globe.gl to v2.39.6 ([#410](https://github.com/glasskube/distr/issues/410)) ([6df822d](https://github.com/glasskube/distr/commit/6df822de466800298730c4df1c1b2efa97aa25aa))
+* **deps:** update dependency posthog-js to v1.215.2 ([#411](https://github.com/glasskube/distr/issues/411)) ([b6dde86](https://github.com/glasskube/distr/commit/b6dde8680af463e0982e03c05fa417944b544618))
+* **deps:** update dependency semver to v7.7.1 ([#412](https://github.com/glasskube/distr/issues/412)) ([99d46ad](https://github.com/glasskube/distr/commit/99d46ad59864222d285f590d91a6a1ce97039de5))
+* **ui:** improve token handling failures ([#407](https://github.com/glasskube/distr/issues/407)) ([6aeaa56](https://github.com/glasskube/distr/commit/6aeaa56b94247c677deaca21bbf53c0410b18335))
+
+
+### Other
+
+* fix helm chart build error ([#408](https://github.com/glasskube/distr/issues/408)) ([c3a0a8c](https://github.com/glasskube/distr/commit/c3a0a8c391d8a0d8b07c522e243d8ba3d2f729f5))
+
+## [1.0.1](https://github.com/glasskube/distr/compare/1.0.0...1.0.1) (2025-02-03)
+
+
+### Bug Fixes
+
+* **deps:** update angular monorepo to v19.1.4 ([#390](https://github.com/glasskube/distr/issues/390)) ([9f5c90c](https://github.com/glasskube/distr/commit/9f5c90c2c30caabc1cc68145bf5bc4181e1f4f4d))
+* **deps:** update aws-sdk-go-v2 monorepo ([#394](https://github.com/glasskube/distr/issues/394)) ([0a53571](https://github.com/glasskube/distr/commit/0a53571001a683c4b460b544ceb5f0e9696d551b))
+* **deps:** update aws-sdk-go-v2 monorepo ([#402](https://github.com/glasskube/distr/issues/402)) ([d27e2f0](https://github.com/glasskube/distr/commit/d27e2f07f0c3b7577d31e6b8b6e36abf169a42c2))
+* **deps:** update dependency @angular/cdk to v19.1.2 ([#391](https://github.com/glasskube/distr/issues/391)) ([e512198](https://github.com/glasskube/distr/commit/e512198ceea5bc0e3d0a43848e359114358e2414))
+* **deps:** update dependency @sentry/angular to v8.52.1 ([#392](https://github.com/glasskube/distr/issues/392)) ([e93952b](https://github.com/glasskube/distr/commit/e93952bd934e869ba1ecda1bf9b26b52faa6e5e4))
+* **deps:** update dependency @sentry/angular to v8.53.0 ([#398](https://github.com/glasskube/distr/issues/398)) ([2f9b802](https://github.com/glasskube/distr/commit/2f9b8025a9cf4395788c34cdabdf842f8319e536))
+* **deps:** update dependency globe.gl to v2.39.3 ([#403](https://github.com/glasskube/distr/issues/403)) ([4e0f6c2](https://github.com/glasskube/distr/commit/4e0f6c296b2855c464024e13878cfdb112e50dc3))
+* **deps:** update dependency globe.gl to v2.39.5 ([#404](https://github.com/glasskube/distr/issues/404)) ([30d68ec](https://github.com/glasskube/distr/commit/30d68ec1ae3a4b3ece5c5159f3b572698fa2b4bb))
+* **deps:** update dependency posthog-js to v1.212.1 ([#387](https://github.com/glasskube/distr/issues/387)) ([d4436b8](https://github.com/glasskube/distr/commit/d4436b8438dad5c4f2e06da4a2f6a50f23be2f07))
+* **deps:** update dependency posthog-js to v1.214.1 ([#395](https://github.com/glasskube/distr/issues/395)) ([bfac7c2](https://github.com/glasskube/distr/commit/bfac7c23b481cd3894bec65bd36085f4bda51723))
+* **deps:** update dependency posthog-js to v1.215.1 ([#401](https://github.com/glasskube/distr/issues/401)) ([1723795](https://github.com/glasskube/distr/commit/1723795c95d8ce6124b80ca481c984d3b7afb63b))
+* **deps:** update dependency semver to v7.7.0 ([#388](https://github.com/glasskube/distr/issues/388)) ([53ecf08](https://github.com/glasskube/distr/commit/53ecf0813a09200d42ccdc38ad16095c3e6c070a))
+* **deps:** update module github.com/spf13/pflag to v1.0.6 ([#389](https://github.com/glasskube/distr/issues/389)) ([0b185f5](https://github.com/glasskube/distr/commit/0b185f5bae26966f2a23783ef0bd49df1faae243))
+* **sdk/js:** make chartName optional ([#400](https://github.com/glasskube/distr/issues/400)) ([9a49a38](https://github.com/glasskube/distr/commit/9a49a38b4aa22353fe6f009aa4671cded956b239))
+
+
+### Other
+
+* **deps:** update angular-cli monorepo to v19.1.5 ([#385](https://github.com/glasskube/distr/issues/385)) ([fca184e](https://github.com/glasskube/distr/commit/fca184e570156b434e4772f6d6e5ed58a829b281))
+
+
+### Docs
+
+* add about section to README.md ([#397](https://github.com/glasskube/distr/issues/397)) ([73a7da6](https://github.com/glasskube/distr/commit/73a7da648cc247cd71ea4b13649b462ae74d0528))
+* add Helm chart README.md ([#399](https://github.com/glasskube/distr/issues/399)) ([0768637](https://github.com/glasskube/distr/commit/07686379c2acdf582863cca578a6fe8712de1d76))
+
 ## [1.0.0](https://github.com/glasskube/distr/compare/0.13.2...1.0.0) (2025-01-29)
 
 

README.md

@@ -18,13 +18,28 @@
 
 Distr is the easiest way to distribute enterprise software to customer-controlled or shared-responsibility environments.
 
+Main features:
+
 - View all deployments and connected agents via the **intuitive web UI**
 - Let your customers control their deployments via the **white-label customer portal**
 - Access the API using our [**rich SDK**](#distr-sdk)
 - Fully open-source and [self-hostable](#self-hosting)
 
 Check out the hosted version at https://app.distr.sh/register/
 
+## About
+
+Distr is an Open Source commercial software distribution platform designed for Independent Software Vendors (ISVs).
+It supports ISVs in delivering their software solutions to end customers operating in complex, customer-controlled environments.
+
+Use cases include:
+
+- On-premises software deployments
+- Bring Your Own Cloud (BYOC) automation
+- Edge & Fleet management
+
+Read more about Distr and our use cases at https://distr.sh/docs/getting-started/about/
+
 ## Architecture overview
 
 ```mermaid
@@ -52,13 +67,15 @@ To get started quickly, do the following:
 <!-- x-release-please-start-version -->
 
 ```shell
-mkdir distr && cd distr && curl -fsSL https://github.com/glasskube/distr/releases/download/1.0.0/deploy-docker.tar.bz2 | tar -jx
+mkdir distr && cd distr && curl -fsSL https://github.com/glasskube/distr/releases/download/1.1.2/deploy-docker.tar.bz2 | tar -jx
 # make necessary changes to the .env file
 docker-compose up -d
 ```
 
 <!-- x-release-please-end -->
 
+Register your first account at http://localhost:8080/register
+
 The full self-hosting documentation is at https://distr.sh/docs/self-hosting/self-hosting/
 
 ### Building from source
@@ -91,7 +108,7 @@ docker-compose up -d
 make run
 ```
 
-Open your browser and navigate to [`http://localhost:8080`](http://localhost:8080) to register a user
+Open your browser and navigate to [`http://localhost:8080/register`](http://localhost:8080/register) to register a user
 and receive the E-Mail verification link via Mailpit on [`http://localhost:8025`](http://localhost:8025).
 
 ## Distr SDK

api/agent.go

@@ -3,23 +3,32 @@ package api
 import "github.com/glasskube/distr/internal/types"
 
 type AgentResource struct {
+	Version types.AgentVersion `json:"version"`
+}
+
+type AgentDeployment struct {
 	RevisionID string `json:"revisionId"`
 }
 
 type DockerAgentResource struct {
 	AgentResource
+	Deployment *DockerAgentDeployment `json:"deployment"`
+}
+
+type DockerAgentDeployment struct {
+	AgentDeployment
 	ComposeFile []byte `json:"composeFile"`
+	EnvFile     []byte `json:"envFile"`
 }
 
 type KubernetesAgentResource struct {
 	AgentResource
 	Namespace  string                     `json:"namespace"`
 	Deployment *KubernetesAgentDeployment `json:"deployment"`
-	Version    types.AgentVersion         `json:"version"`
 }
 
 type KubernetesAgentDeployment struct {
-	RevisionID   string         `json:"revisionId"`
+	AgentDeployment
 	ReleaseName  string         `json:"releaseName"`
 	ChartUrl     string         `json:"chartUrl"`
 	ChartName    string         `json:"chartName"`

api/deployment_target.go

@@ -18,6 +18,7 @@ type DeploymentRequest struct {
 	ApplicationVersionId string  `json:"applicationVersionId"`
 	ReleaseName          *string `json:"releaseName"`
 	ValuesYaml           []byte  `json:"valuesYaml"`
+	EnvFileData          []byte  `json:"envFileData"`
 }
 
 func (d DeploymentRequest) ParsedValuesFile() (result map[string]any, err error) {

api/user_accounts.go

@@ -12,6 +12,11 @@ type CreateUserAccountRequest struct {
 	UserRole        types.UserRole `json:"userRole"`
 }
 
+type CreateUserAccountResponse struct {
+	ID        string `json:"id"`
+	InviteURL string `json:"inviteUrl"`
+}
+
 type UpdateUserAccountRequest struct {
 	Name     string  `json:"name"`
 	Password *string `json:"password"`