Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add docker support #25

Merged
merged 5 commits into from
Oct 17, 2019
Merged

Add docker support #25

merged 5 commits into from
Oct 17, 2019

Conversation

vvmruder
Copy link
Contributor

@vvmruder vvmruder commented Oct 15, 2019

To make usage easier I offer a docker integrated workflow for this tool. So the dependencies are 'hidden' inside the image.
I also included shapely in this image to make it more easy to solve geometrical problems in python scripts.

@vvmruder vvmruder changed the title [WIP] Add docker support Add docker support Oct 15, 2019
@vvmruder
Copy link
Contributor Author

I think now its ready for review. Let me know if I should change something.

Copy link
Member

@balazsdukai balazsdukai left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made a branch pull/25 with the fixes, I'll try to push it to you fork @vvmruder so it can be added to the PR.

.travis.yml Outdated
deploy:
- provider: script
script:
- docker push ${DOCKER_USERNAME}/cjio:latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 'script' provider requires a string, not an array, so this will fail.
The solution is:

script: docker push ...

.travis.yml Outdated
branch: master
- provider: script
script:
- docker tag ${DOCKER_USERNAME}/cjio:latest ${DOCKER_USERNAME}/cjio:dev
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same here.
Plus Travis is not happy about multi-line scripts in the deploy section like this one. So better to write it in a single line and use ; to separate the commands.

Btw this is what made the val3dity deploy fail too.

@balazsdukai
Copy link
Member

balazsdukai commented Oct 17, 2019

Wow @vvmruder is this your doing, or I'm allowed to push directly to your forked repo by default? See my commit 1833e13 on add-docker-support

@balazsdukai balazsdukai merged commit 12f90d8 into cityjson:develop Oct 17, 2019
@vvmruder vvmruder deleted the add-docker-support branch October 22, 2019 08:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants