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

Integrate qgis plugin #3868

Merged
merged 9 commits into from
Jun 27, 2018
Merged

Integrate qgis plugin #3868

merged 9 commits into from
Jun 27, 2018

Conversation

sbrunner
Copy link
Member

No description provided.

@sbrunner sbrunner added this to the 2.3 milestone Jun 26, 2018
Makefile Outdated

.PHONY: docker-build-qgisserver
docker-build-qgisserver: $(shell docker-required --path docker/qgisserver) docker/qgisserver/commons
docker build --tag=$(DOCKER_TEST_BASE)-qgisserver:latest docker/qgisserver
Copy link
Contributor

Choose a reason for hiding this comment

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

Wrong tag...

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed, thanks :-)

@sbrunner sbrunner force-pushed the inegrate-qgis-plugin branch 3 times, most recently from fb34222 to b1670e8 Compare June 26, 2018 12:05
Makefile Outdated
docker/qgisserver/commons: commons
rm --recursive --force $@
cp --recursive $< $@
touch $@
Copy link
Member

Choose a reason for hiding this comment

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

I find simpler to use repository root as docker context

Copy link
Member Author

Choose a reason for hiding this comment

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

No, we relay don't wants to mix everything ...

LABEL maintainer Camptocamp "info@camptocamp.com"

COPY * /var/www/plugins/geomapfish_qgisserver/
COPY __init__.py accesscontrol.py metadata.txt /var/www/plugins/geomapfish_qgisserver/
Copy link
Member

Choose a reason for hiding this comment

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

I would create a folder for the plugin

Copy link
Member Author

Choose a reason for hiding this comment

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

Done :-)

@sbrunner sbrunner changed the title Inegrate qgis plugin Integrate qgis plugin Jun 27, 2018
@sbrunner sbrunner force-pushed the inegrate-qgis-plugin branch from af69406 to 835f14e Compare June 27, 2018 06:22
@camptocamp camptocamp deleted a comment Jun 27, 2018
@sbrunner sbrunner force-pushed the inegrate-qgis-plugin branch from 835f14e to 87209a3 Compare June 27, 2018 06:51
@camptocamp camptocamp deleted a comment Jun 27, 2018
@sbrunner sbrunner force-pushed the inegrate-qgis-plugin branch 4 times, most recently from 6b14ec8 to 06bb57c Compare June 27, 2018 10:39
@sbrunner sbrunner force-pushed the inegrate-qgis-plugin branch from 06bb57c to e2b1191 Compare June 27, 2018 12:08
@sbrunner sbrunner merged commit 1ad61ed into 2.3 Jun 27, 2018
@sbrunner sbrunner deleted the inegrate-qgis-plugin branch June 27, 2018 12:48
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