summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJoost Evertse <joustie@gmail.com>2019-01-21 13:36:56 +0100
committerGitHub <noreply@github.com>2019-01-21 13:36:56 +0100
commitb51d2969ad34a9aad79e42a69f275caf2a4059cb (patch)
treea4519d935a0b5ae5361cb178318402e09da17d75 /contrib
parent53f7de7bfe0056950a8e7271632da3f89e3ba3b3 (diff)
parent52d76312660109d3669d459b11b448a3a60b9603 (diff)
downloadgitlab-b51d2969ad34a9aad79e42a69f275caf2a4059cb.tar.gz
Merge branch 'master' into master
Diffstat (limited to 'contrib')
-rw-r--r--contrib/docker/Dockerfile10
-rw-r--r--contrib/docker/README.rst19
-rw-r--r--contrib/docker/python-gitlab.cfg15
3 files changed, 0 insertions, 44 deletions
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
deleted file mode 100644
index 6663cac..0000000
--- a/contrib/docker/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM python:slim
-
-# Install python-gitlab
-RUN pip install --upgrade python-gitlab
-
-# Copy sample configuration file
-COPY python-gitlab.cfg /
-
-# Define the entrypoint that enable a configuration file
-ENTRYPOINT ["gitlab", "--config-file", "/python-gitlab.cfg"]
diff --git a/contrib/docker/README.rst b/contrib/docker/README.rst
deleted file mode 100644
index 90a576c..0000000
--- a/contrib/docker/README.rst
+++ /dev/null
@@ -1,19 +0,0 @@
-python-gitlab docker image
-==========================
-
-Dockerfile contributed by *oupala*:
-https://github.com/python-gitlab/python-gitlab/issues/295
-
-How to build
-------------
-
-``docker build -t me/python-gitlab:VERSION .``
-
-How to use
-----------
-
-``docker run -it -v /path/to/python-gitlab.cfg:/python-gitlab.cfg python-gitlab <command> ...``
-
-To make things easier you can create a shell alias:
-
-``alias gitlab='docker run --rm -it -v /path/to/python-gitlab.cfg:/python-gitlab.cfg python-gitlab``
diff --git a/contrib/docker/python-gitlab.cfg b/contrib/docker/python-gitlab.cfg
deleted file mode 100644
index 0e51954..0000000
--- a/contrib/docker/python-gitlab.cfg
+++ /dev/null
@@ -1,15 +0,0 @@
-[global]
-default = somewhere
-ssl_verify = true
-timeout = 5
-api_version = 3
-
-[somewhere]
-url = https://some.whe.re
-private_token = vTbFeqJYCY3sibBP7BZM
-api_version = 4
-
-[elsewhere]
-url = http://else.whe.re:8080
-private_token = CkqsjqcQSFH5FQKDccu4
-timeout = 1