fix: adjust namespace of K1Version ldflag (#1483)

* adjust namespace of ldflag * dockerfile run in bash instead of sh * dockerfile run in bash instead of sh
konstructio · Apr 18, 2023 · 3b01e10 · 3b01e10
1 parent cadeb3a
commit 3b01e10
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -14,7 +14,7 @@ builds:
     flags:
       - -trimpath
     ldflags:
-      - -X github.com/kubefirst/kubefirst/configs.K1Version=v{{.Version}}
+      - -X github.com/kubefirst/runtime/configs.K1Version=v{{.Version}}
 
 #archives:
 #  - replacements:

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -29,6 +29,9 @@ RUN curl -LO https://s3.us-west-2.amazonaws.com/amazon-eks/1.21.2/2021-07-05/bin
     chmod +x aws-iam-authenticator && \
     mv aws-iam-authenticator /usr/local/bin/
 
+# change shell from bin/sh to bin/bash
+SHELL ["/bin/bash", "-c"]
+
 # Kubefirst cli
 RUN curl -LO https://github.com/kubefirst/kubefirst/releases/download/$KUBEFIRST_VERSION/kubefirst_${KUBEFIRST_VERSION:1}_linux_amd64.tar.gz && \
     tar -xvzf kubefirst_${KUBEFIRST_VERSION:1}_linux_amd64.tar.gz -C /usr/local/bin/ && \

diff --git a/build/dev/Dockerfile b/build/dev/Dockerfile
@@ -45,7 +45,7 @@ COPY --chown=developer:developer . .
 
 # download dependencies and prepare fresh installation
 RUN go mod download
-RUN go build -ldflags="-X github.com/kubefirst/kubefirst/configs.K1Version=${KUBEFIRST_VERSION}" .
+RUN go build -ldflags="-X github.com/kubefirst/runtime/configs.K1Version=${KUBEFIRST_VERSION}" .
 
 USER root
 RUN  mv ./kubefirst /usr/local/bin/ && chmod 777 /usr/local/bin/kubefirst