Refactor run client step in makefile

Change run-client target in Makefile to automatically remove container after execution. Remove stop-client target, because it's not needed anymore

Issue-ID: AAF-1118
Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com>
Change-Id: Ifbe1803598f23be507ad5c71a11582b03ca2c189

diff --git a/Makefile b/Makefile
index 45ffb48..f94ad9a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,7 @@ run-client:
        mkdir -p `pwd`/compose-resources/client-volume/
        @echo "##### Start Cert Service Client #####"
        docker run \
+           --rm \
            --name aafcert-client \
            --env-file ./compose-resources/client-configuration.env \
            --network certservice_certservice \
@@ -27,12 +28,6 @@ run-client:
            --volume `pwd`/certs/certServiceClient-keystore.jks:/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks \
            onap/org.onap.aaf.certservice.aaf-certservice-client:latest
 
-stop-client:
-       @echo "##### Remove Cert Service Client #####"
-       @echo "Removing aafcert-client"
-       @docker rm aafcert-client > /dev/null 2> /dev/null || true
-       @echo "##### DONE #####"
-
 stop-backend:
        @echo "##### Stop Cert Service #####"
        docker-compose down

diff --git a/README.md b/README.md
index 2523995..98033b4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -48,8 +48,6 @@ make build
 make start-backend
 3. Run Cert Service Client
 make run-client
-3. Remove client container
-make stop-client
 4. Stop Cert Service and EJBCA
 make stop-backend
 ```