summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile10
-rw-r--r--docs/hacking/index.rst6
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index b3cba97d..032c28c2 100644
--- a/Makefile
+++ b/Makefile
@@ -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 f8853709..3cf6d301 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