Skip to content

Commit cfa4af6

Browse files
Issue 29 (#32)
* Initial relative import changes * - Adds a requirements file (for testing) - Fix for Python3 has_key (now "in") - Fix for Python 3 xrange (now range) * - Updated Dockerfile requirements * - Use of Python3 RDKit base image * - Removes the ansible playbook/role (now present in the Squonk project) * - Info on docker usage * - Doc tweak * - Doc tweak
1 parent 18690c0 commit cfa4af6

File tree

11 files changed

+12
-185
lines changed

11 files changed

+12
-185
lines changed

README.md

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -186,30 +186,22 @@ how to do this.
186186

187187
The service descriptors need to to POSTed to the Squonk coreservices REST API.
188188

189-
### Openshift
189+
### Docker
190190

191-
You must previously have deployed Squonk using the OpenShift templates (e.g. using the deployment
192-
scripts or Ansible playbooks).
193-
The deployment uses the [post-service-descriptors.yaml]() template to create a pod that posts the
194-
service descriptors using a `squonk/rdkit-pipelines-sdposter` Docker container.
191+
A shell script can be used to deploy the pipelines to a running
192+
containerised Squonk deployment: -
195193

196-
Build the Docker image and push to docker hub:
194+
$ ./post-service-descriptors.sh
195+
196+
### OpenShift/OKD
197197

198-
```
199-
docker build -t squonk/rdkit-pipelines-sdposter:latest -f Dockerfile-sdposter .
200-
docker push squonk/rdkit-pipelines-sdposter:latest
201-
```
202-
203-
Post the service descriptors by creating the pod. You must been in the `squonk` project and be logged in as a suitable
204-
user.
205-
206-
```
207-
oc create -f post-service-descriptors.yaml
208-
```
209-
210-
Alternatively you can run the `deploy.sh` script having defined some environment variables
211-
using the `setenv.sh` script in the Squonk openshift deployment.
198+
The pipelines and service-descriptor container images are built using gradle
199+
in this project. The are deployed from the Squonk project using Ansible
200+
playbooks.
212201

202+
> A discussion about the deployment of pipelines can be found in the
203+
`Posting Squonk pipelines` section of Squonk's OpenShift Ansible
204+
[README](https://github.com/InformaticsMatters/squonk/blob/master/openshift/ansible/README.md).
213205

214206
## Contact
215207

deploy.sh

Lines changed: 0 additions & 24 deletions
This file was deleted.

openshift/ansible/README.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

openshift/ansible/ansible.cfg

Lines changed: 0 additions & 4 deletions
This file was deleted.

openshift/ansible/group_vars/all.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.

openshift/ansible/inventory

Lines changed: 0 additions & 2 deletions
This file was deleted.

openshift/ansible/playbooks/pipelines/deploy.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

openshift/ansible/playbooks/pipelines/roles

Lines changed: 0 additions & 1 deletion
This file was deleted.

openshift/ansible/roles/pipelines/defaults/main.yaml

Lines changed: 0 additions & 3 deletions
This file was deleted.

openshift/ansible/roles/pipelines/files/post-service-descriptors.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)