Skip to content

Commit 7622d14

Browse files
authored
Remove scm-source.json creation (#2301)
1 parent c580e50 commit 7622d14

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: clean local test linux macos mocks docker push scm-source.json e2e
1+
.PHONY: clean local test linux macos mocks docker push e2e
22

33
BINARY ?= postgres-operator
44
BUILD_FLAGS ?= -v
@@ -48,7 +48,7 @@ SHELL := env PATH=$(PATH) $(SHELL)
4848
default: local
4949

5050
clean:
51-
rm -rf build scm-source.json
51+
rm -rf build
5252

5353
local: ${SOURCES}
5454
hack/verify-codegen.sh
@@ -60,7 +60,7 @@ linux: ${SOURCES}
6060
macos: ${SOURCES}
6161
GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/macos/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $^
6262

63-
docker: ${DOCKERDIR}/${DOCKERFILE} scm-source.json
63+
docker: ${DOCKERDIR}/${DOCKERFILE}
6464
echo `(env)`
6565
echo "Tag ${TAG}"
6666
echo "Version ${VERSION}"
@@ -74,9 +74,6 @@ indocker-race:
7474
push:
7575
docker push "$(IMAGE):$(TAG)$(CDP_TAG)"
7676

77-
scm-source.json: .git
78-
echo '{\n "url": "git:$(GITURL)",\n "revision": "$(GITHEAD)",\n "author": "$(USER)",\n "status": "$(GITSTATUS)"\n}' > scm-source.json
79-
8077
mocks:
8178
GO111MODULE=on go generate ./...
8279

docker/build_operator.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ apt-get install -y wget
2525
export PATH="$PATH:$HOME/go/bin"
2626
export GOPATH="$HOME/go"
2727
mkdir -p build
28-
cp scm-source.json build/
2928

3029
GO111MODULE=on go mod vendor
3130
CGO_ENABLED=0 go build -o build/postgres-operator -v -ldflags "$OPERATOR_LDFLAGS" cmd/main.go

e2e/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ LABEL maintainer="Team ACID @ Zalando <[email protected]>"
66
ENV TERM xterm-256color
77

88
COPY requirements.txt ./
9-
COPY scm-source.json ./
109

1110
RUN apt-get update \
1211
&& apt-get install --no-install-recommends -y \

e2e/Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,9 @@ copy: clean
3636
cp -r ../manifests .
3737
mkdir tls
3838

39-
docker: scm-source.json
39+
docker:
4040
docker build -t "$(IMAGE):$(TAG)" .
4141

42-
scm-source.json: ../.git
43-
echo '{\n "url": "git:$(GITURL)",\n "revision": "$(GITHEAD)",\n "author": "$(USER)",\n "status": "$(GITSTATUS)"\n}' > scm-source.json
44-
4542
push: docker
4643
docker push "$(IMAGE):$(TAG)"
4744

0 commit comments

Comments
 (0)