Remove scm-source.json creation (#2301)

This commit is contained in:
Polina Bungina 2023-04-21 21:45:15 +07:00 committed by GitHub
parent c580e509d3
commit 7622d14b08
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 12 deletions

View File

@ -1,4 +1,4 @@
.PHONY: clean local test linux macos mocks docker push scm-source.json e2e
.PHONY: clean local test linux macos mocks docker push e2e
BINARY ?= postgres-operator
BUILD_FLAGS ?= -v
@ -48,7 +48,7 @@ SHELL := env PATH=$(PATH) $(SHELL)
default: local
clean:
rm -rf build scm-source.json
rm -rf build
local: ${SOURCES}
hack/verify-codegen.sh
@ -60,7 +60,7 @@ linux: ${SOURCES}
macos: ${SOURCES}
GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/macos/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $^
docker: ${DOCKERDIR}/${DOCKERFILE} scm-source.json
docker: ${DOCKERDIR}/${DOCKERFILE}
echo `(env)`
echo "Tag ${TAG}"
echo "Version ${VERSION}"
@ -74,9 +74,6 @@ indocker-race:
push:
docker push "$(IMAGE):$(TAG)$(CDP_TAG)"
scm-source.json: .git
echo '{\n "url": "git:$(GITURL)",\n "revision": "$(GITHEAD)",\n "author": "$(USER)",\n "status": "$(GITSTATUS)"\n}' > scm-source.json
mocks:
GO111MODULE=on go generate ./...

View File

@ -25,7 +25,6 @@ apt-get install -y wget
export PATH="$PATH:$HOME/go/bin"
export GOPATH="$HOME/go"
mkdir -p build
cp scm-source.json build/
GO111MODULE=on go mod vendor
CGO_ENABLED=0 go build -o build/postgres-operator -v -ldflags "$OPERATOR_LDFLAGS" cmd/main.go

View File

@ -6,7 +6,6 @@ LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
ENV TERM xterm-256color
COPY requirements.txt ./
COPY scm-source.json ./
RUN apt-get update \
&& apt-get install --no-install-recommends -y \

View File

@ -36,12 +36,9 @@ copy: clean
cp -r ../manifests .
mkdir tls
docker: scm-source.json
docker:
docker build -t "$(IMAGE):$(TAG)" .
scm-source.json: ../.git
echo '{\n "url": "git:$(GITURL)",\n "revision": "$(GITHEAD)",\n "author": "$(USER)",\n "status": "$(GITSTATUS)"\n}' > scm-source.json
push: docker
docker push "$(IMAGE):$(TAG)"