Skip to content

Commit

Permalink
Issue 29 (#32)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
alanbchristie authored Apr 17, 2019
1 parent 18690c0 commit cfa4af6
Show file tree
Hide file tree
Showing 11 changed files with 12 additions and 185 deletions.
32 changes: 12 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,30 +186,22 @@ how to do this.

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

### Openshift
### Docker

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

Build the Docker image and push to docker hub:
$ ./post-service-descriptors.sh

### OpenShift/OKD

```
docker build -t squonk/rdkit-pipelines-sdposter:latest -f Dockerfile-sdposter .
docker push squonk/rdkit-pipelines-sdposter:latest
```

Post the service descriptors by creating the pod. You must been in the `squonk` project and be logged in as a suitable
user.

```
oc create -f post-service-descriptors.yaml
```

Alternatively you can run the `deploy.sh` script having defined some environment variables
using the `setenv.sh` script in the Squonk openshift deployment.
The pipelines and service-descriptor container images are built using gradle
in this project. The are deployed from the Squonk project using Ansible
playbooks.

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

## Contact

Expand Down
24 changes: 0 additions & 24 deletions deploy.sh

This file was deleted.

22 changes: 0 additions & 22 deletions openshift/ansible/README.md

This file was deleted.

4 changes: 0 additions & 4 deletions openshift/ansible/ansible.cfg

This file was deleted.

16 changes: 0 additions & 16 deletions openshift/ansible/group_vars/all.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions openshift/ansible/inventory

This file was deleted.

6 changes: 0 additions & 6 deletions openshift/ansible/playbooks/pipelines/deploy.yaml

This file was deleted.

1 change: 0 additions & 1 deletion openshift/ansible/playbooks/pipelines/roles

This file was deleted.

3 changes: 0 additions & 3 deletions openshift/ansible/roles/pipelines/defaults/main.yaml

This file was deleted.

This file was deleted.

38 changes: 0 additions & 38 deletions openshift/ansible/roles/pipelines/tasks/main.yaml

This file was deleted.

0 comments on commit cfa4af6

Please sign in to comment.