Skip to content

Commit

Permalink
[FAB-4096] Remove openldap tarball
Browse files Browse the repository at this point in the history
This change set deletes the openldap tar file and separate docker
file.  We no longer need the separate openldap image anyway since LDAP,
MySQL, and Postgres are all built dynamically into a single image
as part of fvt testing.  This is part of CI, so it is assured to
run on all platforms.

Change-Id: Ib471b88955c37460a7b2f1bc88f184efc3fce401
Signed-off-by: Keith Smith <[email protected]>
  • Loading branch information
Keith Smith committed May 22, 2017
1 parent 8206d83 commit 7d680bb
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 33 deletions.
12 changes: 2 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
# - fabric-ca-client - builds the fabric-ca-client executable
# - unit-tests - Performs checks first and runs the go-test based unit tests
# - checks - runs all check conditions (license, format, imports, lint and vet)
# - ldap-tests - runs the LDAP tests
# - docker[-clean] - ensures all docker images are available[/cleaned]
# - clean - cleans the build area

Expand All @@ -47,7 +46,7 @@ BASEIMAGE_RELEASE = 0.3.0
PKGNAME = github.com/hyperledger/$(PROJECT_NAME)

DOCKER_ORG = hyperledger
IMAGES = $(PROJECT_NAME) openldap
IMAGES = $(PROJECT_NAME)
FVTIMAGE = $(PROJECT_NAME)-fvt

path-map.fabric-ca-client := ./cmd/fabric-ca-client
Expand Down Expand Up @@ -84,8 +83,6 @@ vet: .FORCE
fabric-ca-client: bin/fabric-ca-client
fabric-ca-server: bin/fabric-ca-server

openldap: build/image/openldap/$(DUMMY)

bin/%:
@echo "Building ${@F} in bin directory ..."
@mkdir -p bin && go build -o bin/${@F} $(path-map.${@F})
Expand Down Expand Up @@ -126,8 +123,6 @@ build/image/fabric-ca/payload: \
build/docker/bin/fabric-ca-client \
build/docker/bin/fabric-ca-server \
build/fabric-ca.tar.bz2
build/image/openldap/payload : \
images/openldap/openldap.tar
build/image/fabric-ca-fvt/payload: \
build/docker/bin/fabric-ca-client \
build/docker/bin/fabric-ca-server \
Expand All @@ -148,10 +143,7 @@ build/%.tar.bz2:
unit-tests: checks fabric-ca-server fabric-ca-client
@scripts/run_tests

container-tests: docker ldap-tests

ldap-tests: openldap
@scripts/run_ldap_tests
container-tests: docker

fvt-tests:
@scripts/run_fvt_tests
Expand Down
23 changes: 0 additions & 23 deletions images/openldap/Dockerfile.in

This file was deleted.

Binary file removed images/openldap/openldap.tar
Binary file not shown.

0 comments on commit 7d680bb

Please sign in to comment.