Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
postgres-operator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
zalando
postgres-operator
Commits
7622d14b
Unverified
Commit
7622d14b
authored
Apr 21, 2023
by
Polina Bungina
Committed by
GitHub
Apr 21, 2023
Browse files
Options
Downloads
Patches
Plain Diff
Remove scm-source.json creation (#2301)
parent
c580e509
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+3
-6
3 additions, 6 deletions
Makefile
docker/build_operator.sh
+0
-1
0 additions, 1 deletion
docker/build_operator.sh
e2e/Dockerfile
+0
-1
0 additions, 1 deletion
e2e/Dockerfile
e2e/Makefile
+1
-4
1 addition, 4 deletions
e2e/Makefile
with
4 additions
and
12 deletions
Makefile
+
3
−
6
View file @
7622d14b
.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)
...
@@ -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}
...
@@ -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
}
"
...
@@ -74,9 +74,6 @@ indocker-race:
...
@@ -74,9 +74,6 @@ indocker-race:
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 ./...
...
...
This diff is collapsed.
Click to expand it.
docker/build_operator.sh
+
0
−
1
View file @
7622d14b
...
@@ -25,7 +25,6 @@ apt-get install -y wget
...
@@ -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
This diff is collapsed.
Click to expand it.
e2e/Dockerfile
+
0
−
1
View file @
7622d14b
...
@@ -6,7 +6,6 @@ LABEL maintainer="Team ACID @ Zalando <team-acid@zalando.de>"
...
@@ -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
\
...
...
This diff is collapsed.
Click to expand it.
e2e/Makefile
+
1
−
4
View file @
7622d14b
...
@@ -36,12 +36,9 @@ copy: clean
...
@@ -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
)
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment