diff options
| author |   Kiran Kamineni <kiran.k.kamineni@intel.com> | 2018-10-05 11:33:50 -0700 |
|---|---|---|
| committer | Kiran Kamineni <kiran.k.kamineni@intel.com> | 2018-10-05 11:33:57 -0700 |
| commit | 513d6baa67fe8ba8b192132f7efea1467df660ad (patch) | |
| tree | 241406af50c4fa88b856f97b131240d26ee65760 | |
| parent | b3254568d65e53c564a846a666fa6af912c9b474 (diff) | |
Add preload cmdline tool to docker container
Add the preload tool developed in patch 69786 to
sms docker container. It will be used from there
in the kubernetes configuration.
Issue-ID: AAF-532
Change-Id: I7ca1d037514da0d56a6c47d6e0c6b845d2fd9a5e
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
| -rwxr-xr-x | sms-service/bin/build_sms_image.sh | 6 | ||||
| -rw-r--r-- | sms-service/bin/smsdockerfile | 2 | ||||
| -rw-r--r-- | sms-service/src/Makefile | 2 | ||||
| -rw-r--r-- | sms-service/src/preload/Gopkg.lock | 13 |
4 files changed, 10 insertions, 13 deletions
diff --git a/sms-service/bin/build_sms_image.sh b/sms-service/bin/build_sms_image.sh index 10b5418..f5beb4d 100755 --- a/sms-service/bin/build_sms_image.sh +++ b/sms-service/bin/build_sms_image.sh @@ -25,7 +25,11 @@ function generate_binary { pushd ../src/sms make build popd + pushd ../src/preload + make build + popd cp ../target/sms . + cp ../target/preload . } function copy_certificates { @@ -35,7 +39,7 @@ function copy_certificates { } function cleanup { - rm sms + rm sms preload rm aaf-sms.pub rm aaf-sms.pr rm aaf_root_ca.cer diff --git a/sms-service/bin/smsdockerfile b/sms-service/bin/smsdockerfile index 9b7fb9a..cdb8494 100644 --- a/sms-service/bin/smsdockerfile +++ b/sms-service/bin/smsdockerfile @@ -12,6 +12,8 @@ ADD aaf-sms.pub /sms/certs/aaf-sms.pub ADD aaf-sms.pr /sms/certs/aaf-sms.pr ADD sms /sms/bin/sms RUN chmod +x /sms/bin/sms +ADD preload /sms/bin/preload +RUN chmod +x /sms/bin/preload WORKDIR /sms ENTRYPOINT ["/sms/bin/sms"] diff --git a/sms-service/src/Makefile b/sms-service/src/Makefile index 9036c73..b1c92b9 100644 --- a/sms-service/src/Makefile +++ b/sms-service/src/Makefile @@ -5,7 +5,9 @@ buildclient: build: buildclient $(MAKE) -C sms build $(MAKE) -C quorumclient build + $(MAKE) -C preload build deploy: $(MAKE) -C sms deploy $(MAKE) -C quorumclient deploy + $(MAKE) -C preload deploy diff --git a/sms-service/src/preload/Gopkg.lock b/sms-service/src/preload/Gopkg.lock index 94ca755..8994185 100644 --- a/sms-service/src/preload/Gopkg.lock +++ b/sms-service/src/preload/Gopkg.lock @@ -9,20 +9,9 @@ revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" -[[projects]] - digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "UT" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" - [solve-meta] analyzer-name = "dep" analyzer-version = 1 - input-imports = [ - "github.com/pkg/errors", - "gopkg.in/yaml.v2", - ] + input-imports = ["github.com/pkg/errors"] solver-name = "gps-cdcl" solver-version = 1 |