From d51604f4ec3555fe7823ecf7dea4b40627a9da92 Mon Sep 17 00:00:00 2001
From: Michael Geers <michael@geers.tv>
Date: Wed, 24 Jan 2024 14:02:37 +0100
Subject: [PATCH] Add TESLA_CLIENT_ID to docker build

---
 .goreleaser-nightly.yml | 10 ++++++----
 .goreleaser.yml         | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.goreleaser-nightly.yml b/.goreleaser-nightly.yml
index d81a33db0..505ec6beb 100644
--- a/.goreleaser-nightly.yml
+++ b/.goreleaser-nightly.yml
@@ -9,7 +9,7 @@ builds:
       - -trimpath
       - -tags=release
     ldflags:
-      - -X github.com/evcc-io/evcc/server.Version={{ .Tag }} -X github.com/evcc-io/evcc/server.Commit={{ .ShortCommit }} -s -w
+      - -X github.com/evcc-io/evcc/server.Version={{ .Tag }} -X github.com/evcc-io/evcc/server.Commit={{ .ShortCommit }} -X github.com/evcc-io/evcc/vehicle/tesla-vehicle-command.OAuth2Config.ClientID={{ .Env.TESLA_CLIENT_ID }} -s -w
     env:
       - CGO_ENABLED=0
     goos:
@@ -25,9 +25,10 @@ builds:
         goarch: arm
       - goos: windows
         goarch: arm64
-    docker:
-      build_flag_templates:
-        - "--build-arg=TESLA_CLIENT_ID=${TESLA_CLIENT_ID}"
+
+dockers:
+  - build_flag_templates:
+      - "--build-arg=TESLA_CLIENT_ID={{ .Env.TESLA_CLIENT_ID }}"
 
 archives:
   - builds:
@@ -43,6 +44,7 @@ archives:
 
 env:
   - CGO_ENABLED=0
+  - TESLA_CLIENT_ID={{ .Env.TESLA_CLIENT_ID }}
 
 universal_binaries:
   - replace: true
diff --git a/.goreleaser.yml b/.goreleaser.yml
index cb88a230d..93c599f52 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -11,7 +11,7 @@ builds:
       - -trimpath
       - -tags=release
     ldflags:
-      - -X github.com/evcc-io/evcc/server.Version={{ .Version }} -s -w
+      - -X github.com/evcc-io/evcc/server.Version={{ .Version }} -X github.com/evcc-io/evcc/vehicle/tesla-vehicle-command.OAuth2Config.ClientID={{ .Env.TESLA_CLIENT_ID }} -s -w
     env:
       - CGO_ENABLED=0
     goos:
@@ -29,12 +29,14 @@ builds:
         goarch: arm
       - goos: windows
         goarch: arm64
-    docker:
-      build_flag_templates:
-        - "--build-arg=TESLA_CLIENT_ID=${TESLA_CLIENT_ID}"
+
+dockers:
+  - build_flag_templates:
+      - "--build-arg=TESLA_CLIENT_ID={{ .Env.TESLA_CLIENT_ID }}"
 
 env:
   - CGO_ENABLED=0
+  - TESLA_CLIENT_ID={{ .Env.TESLA_CLIENT_ID }}
 
 archives:
   - builds: