diff --git a/CMakeLists.txt b/CMakeLists.txt index ff0352f04..53c35b812 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,7 +26,7 @@ add_custom_target(bootstrapper ALL # cli # add_custom_target(cli ALL - CGO_ENABLED=0 go build -o ${CMAKE_BINARY_DIR}/constellation -tags='${CLI_BUILD_TAGS}' -ldflags "-buildid='' -X github.com/edgelesssys/constellation/internal/constants.VersionInfo=${PROJECT_VERSION}" + CGO_ENABLED=0 go build -o ${CMAKE_BINARY_DIR}/constellation -tags='${CLI_BUILD_TAGS}' -ldflags "-buildid='' -X github.com/edgelesssys/constellation/v2/internal/constants.VersionInfo=${PROJECT_VERSION}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cli BYPRODUCTS constellation ) diff --git a/Dockerfile.build b/Dockerfile.build index 2bec3bbbd..fb24b09fb 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -30,7 +30,7 @@ RUN go build -o bootstrapper -tags=disable_tpm_simulator -buildvcs=false -ldflag FROM build AS build-disk-mapper WORKDIR /constellation/disk-mapper/ -RUN go build -o disk-mapper -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/internal/constants.VersionInfo=${PROJECT_VERSION}" ./cmd/ +RUN go build -o disk-mapper -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/v2/internal/constants.VersionInfo=${PROJECT_VERSION}" ./cmd/ FROM scratch AS bootstrapper COPY --from=build-bootstrapper /constellation/bootstrapper/bootstrapper / diff --git a/joinservice/Dockerfile b/joinservice/Dockerfile index a8c840994..37f72da79 100644 --- a/joinservice/Dockerfile +++ b/joinservice/Dockerfile @@ -23,7 +23,7 @@ RUN rm -rf ./hack/ WORKDIR /constellation/joinservice ARG PROJECT_VERSION=0.0.0 -RUN CGO_ENABLED=0 go build -o join-service -trimpath -buildvcs=false -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/internal/constants.VersionInfo=${PROJECT_VERSION}" ./cmd/ +RUN CGO_ENABLED=0 go build -o join-service -trimpath -buildvcs=false -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/v2/internal/constants.VersionInfo=${PROJECT_VERSION}" ./cmd/ # Use gcr.io/distroless/static here since we need CA certificates to be installed for aTLS operations on GCP. FROM gcr.io/distroless/static@sha256:d673e44035b1435c88f63c4b7066501e21fe5c6b111cd9ada7d9301f780b2416 as release diff --git a/kms/Dockerfile b/kms/Dockerfile index 8813ec92c..2128c7e90 100644 --- a/kms/Dockerfile +++ b/kms/Dockerfile @@ -24,7 +24,7 @@ RUN rm -rf ./hack/ RUN mkdir -p /constellation/build WORKDIR /constellation/kms/cmd ARG PROJECT_VERSION=0.0.0 -RUN CGO_ENABLED=0 go build -o /constellation/build/kmsserver -trimpath -buildvcs=false -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/internal/constants.VersionInfo=${PROJECT_VERSION}" +RUN CGO_ENABLED=0 go build -o /constellation/build/kmsserver -trimpath -buildvcs=false -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/v2/internal/constants.VersionInfo=${PROJECT_VERSION}" # Use gcr.io/distroless/static here since we need CA certificates to be installed for aTLS operations on GCP. FROM gcr.io/distroless/static@sha256:d673e44035b1435c88f63c4b7066501e21fe5c6b111cd9ada7d9301f780b2416 as release diff --git a/verify/Dockerfile b/verify/Dockerfile index f245c70d2..813d9ac4b 100644 --- a/verify/Dockerfile +++ b/verify/Dockerfile @@ -23,7 +23,7 @@ RUN rm -rf ./hack/ WORKDIR /constellation/verify ARG PROJECT_VERSION=0.0.0 -RUN CGO_ENABLED=0 go build -o verify-service -trimpath -buildvcs=false -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/internal/constants.VersionInfo=${PROJECT_VERSION}" ./cmd/ +RUN CGO_ENABLED=0 go build -o verify-service -trimpath -buildvcs=false -ldflags "-s -w -buildid='' -X github.com/edgelesssys/constellation/v2/internal/constants.VersionInfo=${PROJECT_VERSION}" ./cmd/ FROM scratch AS release COPY --from=build /constellation/verify/verify-service /verify