diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 95d719a251465aa53ac668f0707728b4d4cdc9a2..920107361aaeb3d9ab8e738538d67b6bf3dc9323 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - checks - - tests - package + - tests - coverage variables: @@ -81,22 +81,22 @@ tests-3.9: tags: [docker] image: docker:latest services: - - docker:dind + - docker:latest + before_script: + - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_USER $CI_REGISTRY script: - - docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY - - docker build --pull -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" - - docker tag "$CI_REGISTRY_IMAGE:$IMAGE_TAG" "$CI_REGISTRY_IMAGE:latest" - - docker push "$CI_REGISTRY_IMAGE:latest" + - echo "$CI_REGISTRY_IMAGE" + - docker pull $CI_REGISTRY_IMAGE:latest || true + - docker build --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$IMAGE_TAG --tag $CI_REGISTRY_IMAGE:latest . + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA + - docker push $CI_REGISTRY_IMAGE:latest 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