public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into gh-pages

This commit is contained in:
Felix Kunde 2023-04-21 17:16:57 +02:00
parent f2ee5a300a af084a5a65
commit 0f96fae721
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
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 BINARY ?= postgres-operator
BUILD_FLAGS ?= -v BUILD_FLAGS ?= -v
@ -48,7 +48,7 @@ SHELL := env PATH=$(PATH) $(SHELL)
default: local default: local
clean: clean:
rm -rf build scm-source.json rm -rf build
local: ${SOURCES} local: ${SOURCES}
hack/verify-codegen.sh hack/verify-codegen.sh
@ -60,7 +60,7 @@ linux: ${SOURCES}
macos: ${SOURCES} macos: ${SOURCES}
GOOS=darwin GOARCH=amd64 CGO_ENABLED=${CGO_ENABLED} go build -o build/macos/${BINARY} ${BUILD_FLAGS} -ldflags "$(LDFLAGS)" $^ 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 `(env)`
echo "Tag ${TAG}" echo "Tag ${TAG}"
echo "Version ${VERSION}" echo "Version ${VERSION}"
@ -69,14 +69,11 @@ docker: ${DOCKERDIR}/${DOCKERFILE} scm-source.json
docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" . docker build --rm -t "$(IMAGE):$(TAG)$(CDP_TAG)$(DEBUG_FRESH)$(DEBUG_POSTFIX)" -f "${DOCKERDIR}/${DOCKERFILE}" --build-arg VERSION="${VERSION}" .
indocker-race: indocker-race:
docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.18.9 bash -c "make linux" docker run --rm -v "${GOPATH}":"${GOPATH}" -e GOPATH="${GOPATH}" -e RACE=1 -w ${PWD} golang:1.19.8 bash -c "make linux"
push: push:
docker push "$(IMAGE):$(TAG)$(CDP_TAG)" 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: mocks:
GO111MODULE=on go generate ./... GO111MODULE=on go generate ./...

1
docker/build_operator.sh
View File

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

1
e2e/Dockerfile
View File

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

5
e2e/Makefile
View File

@ -36,12 +36,9 @@ copy: clean
cp -r ../manifests . cp -r ../manifests .
mkdir tls mkdir tls
docker: scm-source.json docker:
docker build -t "$(IMAGE):$(TAG)" . 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 push: docker
docker push "$(IMAGE):$(TAG)" docker push "$(IMAGE):$(TAG)"