Skip to content

Commit

Permalink
Merge pull request #17373 from jupierce/remove_gitserver
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue.

Removing gitserver from build images

Fixes #17345
  • Loading branch information
openshift-merge-robot authored Nov 19, 2017
2 parents 353de8f + 911ce1c commit 79097d0
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions hack/lib/constants.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ readonly OS_SDN_COMPILE_TARGETS_LINUX=(
)
readonly OS_IMAGE_COMPILE_TARGETS_LINUX=(
cmd/dockerregistry
cmd/gitserver
vendor/k8s.io/kubernetes/cmd/hyperkube
"${OS_SDN_COMPILE_TARGETS_LINUX[@]}"
)
Expand Down Expand Up @@ -344,7 +343,6 @@ readonly OS_ALL_IMAGES=(
openshift/origin-egress-router
openshift/origin-egress-http-proxy
openshift/origin-recycler
openshift/origin-gitserver
openshift/origin-cluster-capacity
openshift/origin-service-catalog
openshift/origin-template-service-broker
Expand All @@ -368,7 +366,6 @@ function os::build::images() {

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

# determine the correct tag prefix
tag_prefix="${OS_IMAGE_PREFIX:-"openshift/origin"}"
Expand All @@ -394,7 +391,6 @@ function os::build::images() {
# images that depend on "${tag_prefix}
( os::build::image "${tag_prefix}-haproxy-router" images/router/haproxy ) &
( os::build::image "${tag_prefix}-keepalived-ipfailover" images/ipfailover/keepalived ) &
( os::build::image "${tag_prefix}-gitserver" examples/gitserver ) &
( os::build::image "${tag_prefix}-deployer" images/deployer ) &
( os::build::image "${tag_prefix}-recycler" images/recycler ) &
( os::build::image "${tag_prefix}-docker-builder" images/builder/docker/docker-builder ) &
Expand Down

0 comments on commit 79097d0

Please sign in to comment.