diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5935112b6f336a55331c48bda1d72e2c0118e97..5741684242954b0e9b23f4d2c40ca862f17a9570 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,11 +19,11 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. variables: - CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb-pylib-testenv + CI_REGISTRY_IMAGE: $CI_REGISTRY/caosdb/caosdb-pylib/testenv:latest # When using dind, it's wise to use the overlayfs driver for # improved performance. -image: $CI_REGISTRY_IMAGE:latest +image: $CI_REGISTRY_IMAGE stages: - code_style @@ -77,12 +77,12 @@ build-testenv: - schedules script: - cd unittests/docker - - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY # use here general latest or specific branch latest... - - docker pull $CI_REGISTRY_IMAGE:latest || true + - docker pull $CI_REGISTRY_IMAGE|| true - docker build --pull --build-arg COMMIT=$CI_COMMIT_SHORT_SHA - --cache-from $CI_REGISTRY_IMAGE:latest - -t $CI_REGISTRY_IMAGE:latest . - - docker push $CI_REGISTRY_IMAGE:latest + --cache-from $CI_REGISTRY_IMAGE + -t $CI_REGISTRY_IMAGE . + - docker push $CI_REGISTRY_IMAGE diff --git a/src/caosdb/connection/connection.py b/src/caosdb/connection/connection.py index 3e2ec2cdba5e4cddce6557969c661ba82c1c16d2..6ee83d34c7779c6fa5d6ccb35d5758c0e91af13d 100644 --- a/src/caosdb/connection/connection.py +++ b/src/caosdb/connection/connection.py @@ -310,9 +310,12 @@ def configure_connection(**kwargs): Parameters ---------- - implementation : CaosDBServerConnection - The class which implements the connection. (Default: - _DefaultCaosDBServerConnection) + + username : str + Username for login; e.g. 'admin'. + + password : str + Password for login if 'plain' is used as password_method. password_method : str The name of a submodule of caosdb.connection.authentication which @@ -330,6 +333,10 @@ def configure_connection(**kwargs): Whether SSL certificate warnings should be ignored. Only use this for development purposes! (Default: False) + implementation : CaosDBServerConnection + The class which implements the connection. (Default: + _DefaultCaosDBServerConnection) + Returns ------- _Connection