diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95d719a251465aa53ac668f0707728b4d4cdc9a2..de8f5d84e9d1b0b7f166bc685611d4fe7da36767 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - checks - - tests - package + - tests - coverage variables: @@ -81,10 +81,12 @@ tests-3.9: tags: [docker] image: docker:latest services: - - docker:dind + - docker:latest + before_script: + - echo "$DOCKER_REGISTRY_PASS" | docker login $DOCKER_REGISTRY --username $DOCKER_REGISTRY_USER --password-stdin script: - - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - - docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . + - echo "$CI_REGISTRY_IMAGE" + - docker build . #-t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" . - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:$IMAGE_TAG" - docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG" @@ -95,8 +97,8 @@ container: extends: .container variables: IMAGE_TAG: "dev" - rules: - - when: manual +# rules: +# - when: manual pypi_test: stage: package diff --git a/Dockerfile b/Dockerfile index d698499216414ba38557b8c60a980bdc33bf7623..26b14fea0df87ead30a77f876de29ecef2dff863 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM registry.duniter.org/docker/python3/poetry/3.9:latest +RUN ls && ls silkaj + # Install Silkaj RUN poetry install