diff options
| author | Kali Kaneko <kali@leap.se> | 2017-10-03 22:51:03 +0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-10-03 22:51:03 +0200 |
| commit | 916e7539cd0e86fbd639c514036296829b26606e (patch) | |
| tree | 3908bc83cbc24a7927bbc6943b01e72773b74a8d | |
| parent | 8d3afc5600ee365ac3c2309114d1917fb46ce81e (diff) | |
[docs] add a package_in_docker target
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | docs/hacking/index.rst | 6 |
2 files changed, 13 insertions, 3 deletions
@@ -77,6 +77,13 @@ doc: bundle_in_virtualenv: pkg/build_bundle_with_venv.sh +docker_container: + cd pkg/docker_bundle && docker build -t mybundle . + +package_in_docker: + # needs docker_ce and gitlab-runner from upstream + gitlab-runner exec docker package:amd64_stretch + bundle_in_docker: # needs a docker container called 'mybundle', created with 'make docker_container' rm -rf $(DIST_VERSION) bitmaskbuild @@ -84,9 +91,6 @@ bundle_in_docker: cp -r bitmaskbuild/$(DIST_VERSION) dist/ rm -rf bitmaskbuild -docker_container: - cd pkg/docker_bundle && docker build -t mybundle . - upload: python setup.py sdist bdist_wheel --universal upload --sign -i kali@leap.se -r pypi diff --git a/docs/hacking/index.rst b/docs/hacking/index.rst index f885370..3cf6d30 100644 --- a/docs/hacking/index.rst +++ b/docs/hacking/index.rst @@ -39,6 +39,12 @@ For debugging issues related to how tests are run by the gitlab CI, you need to * docker_ce from docker's repositories. * gitlab-runner from `gitlab's repositories`_ + +You probably want to add `sleep 9000` to allow debuggin on the docker container. For convenience, you can execute the packaging step by doing:: + + make package_in_docker + +Look at the ``Makefile`` to see the command that it's actually used. .. _`gitlab's repositories`: https://packages.gitlab.com/install/repositories/runner/gitlab-runner/script.deb.sh |