Skip to content

Commit 79097d0

Browse files
Merge pull request #17373 from jupierce/remove_gitserver
Automatic merge from submit-queue. Removing gitserver from build images Fixes #17345
2 parents 353de8f + 911ce1c commit 79097d0

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

hack/lib/constants.sh

-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ readonly OS_SDN_COMPILE_TARGETS_LINUX=(
3232
)
3333
readonly OS_IMAGE_COMPILE_TARGETS_LINUX=(
3434
cmd/dockerregistry
35-
cmd/gitserver
3635
vendor/k8s.io/kubernetes/cmd/hyperkube
3736
"${OS_SDN_COMPILE_TARGETS_LINUX[@]}"
3837
)
@@ -344,7 +343,6 @@ readonly OS_ALL_IMAGES=(
344343
openshift/origin-egress-router
345344
openshift/origin-egress-http-proxy
346345
openshift/origin-recycler
347-
openshift/origin-gitserver
348346
openshift/origin-cluster-capacity
349347
openshift/origin-service-catalog
350348
openshift/origin-template-service-broker
@@ -368,7 +366,6 @@ function os::build::images() {
368366

369367
# Link or copy image binaries to the appropriate locations.
370368
ln_or_cp "${OS_OUTPUT_BINPATH}/linux/amd64/hello-openshift" examples/hello-openshift/bin
371-
ln_or_cp "${OS_OUTPUT_BINPATH}/linux/amd64/gitserver" examples/gitserver/bin
372369

373370
# determine the correct tag prefix
374371
tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin"}"
@@ -394,7 +391,6 @@ function os::build::images() {
394391
# images that depend on "${tag_prefix}
395392
( os::build::image "${tag_prefix}-haproxy-router" images/router/haproxy ) &
396393
( os::build::image "${tag_prefix}-keepalived-ipfailover" images/ipfailover/keepalived ) &
397-
( os::build::image "${tag_prefix}-gitserver" examples/gitserver ) &
398394
( os::build::image "${tag_prefix}-deployer" images/deployer ) &
399395
( os::build::image "${tag_prefix}-recycler" images/recycler ) &
400396
( os::build::image "${tag_prefix}-docker-builder" images/builder/docker/docker-builder ) &

0 commit comments

Comments
 (0)