Merge pull request #7 from jhanna-kx/jimdigriz-getlic

Jimdigriz getlic

Author: jhanna-kx

.travis.yml

@@ -1,37 +1,41 @@
 language: c
-
 os:
-  - linux
-  - osx
-
+- linux
+- osx
 git:
   depth: 1
-
 script:
-  - export PROJECT=$(echo $TRAVIS_REPO_SLUG | cut -d/ -f2-)
-  - if [ $TRAVIS_OS_NAME = linux ]; then QLIBDIR=l64; elif [ $TRAVIS_OS_NAME = osx ]; then QLIBDIR=m64; else echo "unknown OS ('$TRAVIS_OS_NAME')" >&2; exit 1; fi; export QLIBDIR
-  - make $QLIBDIR/p.so
-  - tar czf ${PROJECT}_${TRAVIS_TAG}_${TRAVIS_OS_NAME}.tgz LICENSE p.q p.k $QLIBDIR/p.so
-
+- make p.so
+- echo "Preparing version $TRAVIS_BRANCH-$TRAVIS_COMMIT"
+- tar czf embedPy_$TRAVIS_OS_NAME-$TRAVIS_BRANCH.tgz p.q p.k test.q tests [ml]64/p.so LICENSE README.md
+- echo "Packaged as embedPy_$TRAVIS_OS_NAME-$TRAVIS_BRANCH.zip"
+compiler:
+- clang
 deploy:
   provider: releases
-  api_key: $GITHUB_OAUTH_TOKEN
-  file: ${PROJECT}_${TRAVIS_TAG}_${TRAVIS_OS_NAME}.tgz
+  api_key: "$GITHUB_APIKEY"
+  file_glob: true
+  file: embedPy_$TRAVIS_OS_NAME-$TRAVIS_BRANCH.tgz
   skip_cleanup: true
   on:
     tags: true
-
 jobs:
   include:
     - stage: docker
       sudo: required
       services:
         - docker
       script:
-        - eval ${DOCKER_IMAGE:+docker build -t $DOCKER_IMAGE -f docker/Dockerfile .}
+        - docker build -t kxsys/embedpy:latest -f docker/Dockerfile .
+        - docker tag kxsys/embedpy:latest kxsys/embedpy:$TRAVIS_BRANCH
       deploy:
         provider: script
-        script: eval ${DOCKER_IMAGE:+echo $DOCKER_API_KEY | docker login --username $DOCKER_USERNAME --password-stdin && docker push $DOCKER_IMAGE}
+        script:
+          - echo $DOCKER_PASSWORD|docker login --username $DOCKER_USERNAME --password-stdin && docker push kxsys/embedpy:latest && docker push kxsys/embedpy:$TRAVIS_BRANCH
         skip_cleanup: true
         on:
           tags: true
+          condition: $TRAVIS_BRANCH =~ ^[0-9]+\.
+notifications:
+  slack:
+    secure: "MR5icOywJJSFy7gnxeNXACN2nKiHniVgX1myiF+H9U4wsW6+2BHzPMcmy3FIUjL3Tb+PcAfq7+8RHerAx/XEB7nsVJsu9TyCjYWgaqx5Z9WNIDcjQh4wnFurhlzqrwF4gjelY+wxdffpsKUVaP+fermWbqHvv1aPPk4l3xEonXZ5J5uNkPTPufILzpx2cTxWg08o6PhvgjTrombs+9rGxahU8cfUSwTVuPCcPtOy70kcaowFfrU2kWzQk88NM5d/TVZdkOmGhLqVWSvRgaLXFkGYwRWatT7divlXX2evYwdYib++RUUhxDGZwJjdFCbGDNjrMyBbJOrCkndxLSATd6gN76dWuWsVV49K4YB0Mw5uFJFt6J0TnbkJC5Zsl9i6vik7m3anuIPOeAI54/wtlCvMeIpt2eQCPMy7xXu2hXNUR4ofM4yaVjKz69b5JIZ1o3vBxPQxAqIYggqPsTaLJM4vLpZlncnViBkfO/La5V9sJNQy3IyLSlEKry3giYfo8wbHT3PLn1xG7HW2DJ7hRn19yzTkCCNfaSzvq8YlSQvjNlPCO566ykYYG6SzG/NnbDqJAqydhpFuNC7ZB5dPuAOoDANCGs4gtfYKia+ZVxKYn25Y52vdi34L5TO83BUrsQWgytb0J6a4jDe3PWLVFSP7XLiy4h8Tyv76+Hm4lHk="

README.md

@@ -67,49 +67,7 @@ If you have [Docker installed](https://www.docker.com/community-edition) you can
 
     q)
 
-For subsequent runs, you will not be prompted to redo the license setup when calling:
-
-    $ docker start -ai myembedpy
-    KDB+ 3.5 2018.04.25 Copyright (C) 1993-2018 Kx Systems
-    l64/ 4()core 7905MB kx 0123456789ab 172.17.0.2 EXPIRE 2018.12.04 [email protected] KOD #0000000
-    
-    q)
-
-If you prefer to drop straight into `bash` you can with:
-
-    $ docker run -it kxsys/embedpy bash
-    [snipped license setup]
-    kx@8ac226623908:~$ conda info
-    
-         active environment : kx
-        active env location : /home/kx/.conda/envs/kx
-    [snipped]
-    kx@8ac226623908:~$ q
-    KDB+ 3.5 2018.04.25 Copyright (C) 1993-2018 Kx Systems
-    l64/ 4()core 7905MB kx 0123456789ab 172.17.0.2 EXPIRE 2018.12.04 [email protected] KOD #0000000
-    
-    q)
-
-**N.B.** [build instructions for the image are available](docker/README.md)
-
-#### Headless/Presets
-
-If you are running this in a headless configuration, or wish to provide out-of-bound the answers to the license process, then you can call upon the following environment variables.  This is handled either by [`--env` (or `--env-file`) as detailed on the docker website](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file).
-
- * **`KDB_LICENSE_AGREE`:** pass in `yes` (case-insensitive) to agree to the license agreement
- * **`COMPANY` (optional):** provide company name
- * **`NAME`:** provide your name
- * **`EMAIL`:** provide your email address
-
-If any of these are missing, then you will be prompted for the value as before.
-
-**N.B.** alternatively you can use `QLIC_KC` (also supported is `QLIC_K4`) which is the base64 encoded contents of your `kc.lic` file
-
-This allows for the following usage:
-
-    $ echo \\\\ | docker run -i -e QLIC_KC=$(cat $QHOME/kc.lic | base64 -w0) --name myembedpy embedpy q -q
-    $ echo 'p)print(1+2)' | docker start -i myembedpy
-    3
+**N.B.** Further options for running and build instructions for the image are available [here](docker/README.md)
 
 ## Usage
 

docker/README.md

@@ -1,14 +1,81 @@
-The instructions below are for building your own Docker image. A prebuilt Docker image is available on Docker Cloud, if you only want to run the embedPy image then install Docker and [read the main instructions](https://github.com/KxSystems/embedPy#docker) on how to do this.
+# Run
 
-# Preflight
+If you have [Docker installed](https://www.docker.com/community-edition) there is a prebuilt docker image you can run with:
+
+    $ docker run -it --name myembedpy kxsys/embedpy
+    kdb+ on demand - Personal Edition
+    
+    [snipped]
+    
+    I agree to the terms of the license agreement for kdb+ on demand Personal Edition (N/y): y
+    
+    If applicable please provide your company name (press enter for none): ACME Limited
+    Please provide your name: Bob Smith
+    Please provide your email (requires validation): [email protected]
+    KDB+ 3.5 2018.04.25 Copyright (C) 1993-2018 Kx Systems
+    l64/ 4()core 7905MB kx 0123456789ab 172.17.0.2 EXPIRE 2018.12.04 [email protected] KOD #0000000
+    
+    q)
+
+For subsequent runs, you will not be prompted to redo the license setup when calling:
+
+    $ docker start -ai myembedpy
+    KDB+ 3.5 2018.04.25 Copyright (C) 1993-2018 Kx Systems
+    l64/ 4()core 7905MB kx 0123456789ab 172.17.0.2 EXPIRE 2018.12.04 [email protected] KOD #0000000
+    
+    q)
+
+If you prefer to drop straight into `bash` you can with:
+
+    $ docker run -it kxsys/embedpy bash
+    [snipped license setup]
+    kx@8ac226623908:~$ conda info
+    
+         active environment : kx
+        active env location : /home/kx/.conda/envs/kx
+    [snipped]
+    kx@8ac226623908:~$ q
+    KDB+ 3.5 2018.04.25 Copyright (C) 1993-2018 Kx Systems
+    l64/ 4()core 7905MB kx 0123456789ab 172.17.0.2 EXPIRE 2018.12.04 [email protected] KOD #0000000
+    
+    q)
+
+**N.B.** [build instructions for the image are available](README.md#build)
+
+## Headless/Presets
+
+If you are running this in a headless configuration, or wish to provide out-of-bound the answers to the license process, then you can call upon the following environment variables.  This is handled either by [`--env` (or `--env-file`) as detailed on the docker website](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file).
+
+ * **`KDB_LICENSE_AGREE`:** pass in `yes` (case-insensitive) to agree to the license agreement
+ * **`COMPANY` (optional):** provide company name
+ * **`NAME`:** provide your name
+ * **`EMAIL`:** provide your email address
+
+If any of these are missing, then you will be prompted for the value as before.
+
+**N.B.** alternatively if you already have a licence you can use `QLIC_KC` (also supported is `QLIC_K4`) which is the base64 encoded contents of your `kc.lic` file
+
+This allows for the following usage:
+
+
+    $ echo \\\\ | docker run -i -e QLIC_KC=$(cat $QHOME/kc.lic | base64 -w0) --name myembedpywithlic kxsys/embedpy q -q
+    $ echo 'p)print(1+2)' | docker start -i myembedpywithlic
+    3
+
+
+# Build
+
+The instructions below are for building your own Docker image. A prebuilt Docker image is available on Docker Cloud, if you only want to run the embedPy image then install Docker and [read the instructions above](README.md#run) on how to do this.
+
+## Preflight
 
 You will need [Docker installed](https://www.docker.com/community-edition) on your workstation; make sure it is a recent version.
 
 Check out a copy of the project with:
 
     git clone https://github.com/KxSystems/embedPy.git
 
-# Build
+## Building
 
 To build locally the project you run:
 
@@ -20,7 +87,7 @@ Once built, you should have a local `embedpy` image, you can run the following t
 
 # Deploy
 
-[Google Cloud Builder](https://cloud.google.com/container-builder/docs/) is configured to monitor when tags of the format `/^[0-9.]+/` are added to the [GitHub hosted project](https://github.com/KxSystems/embedPy), a corresponding Docker image is generated and made available on [Docker Cloud](https://cloud.docker.com/)
+[travisCI](https://travis-ci.org/) is configured to monitor when tags of the format `/^[0-9]+\./` are added to the [GitHub hosted project](https://github.com/KxSystems/embedPy), a corresponding Docker image is generated and made available on [Docker Cloud](https://cloud.docker.com/)
 
 This is all done server side as the resulting image is north of 350MB.
 
@@ -30,7 +97,6 @@ To do a deploy, you simply tag and push your releases as usual:
     git tag 0.7
     git push --tag
 
-## Travis Option
 
 ## Related Links