diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b2a7d2d451b4fa55de2c5d76e2d780e5592c284b..179095eb68aaf28e08ec33b6bd450edea72c982b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,17 +9,12 @@ variables: docker_build_and_release_tests: stage: docker_build - image: docker:latest - tags: [docker-in-docker] - services: - - docker:dind - variables: - IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + image: quay.io/podman/stable script: - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - - cd test && docker build --build-arg ci_token=$CI_JOB_TOKEN --pull -t $IMAGE_TAG . - - docker tag $IMAGE_TAG $CI_REGISTRY_IMAGE:integration-test - - docker push $CI_REGISTRY_IMAGE:integration-test + - echo -n "$CI_JOB_TOKEN" | podman login -u gitlab-ci-token --password-stdin $CI_REGISTRY + - cd test && podman build --build-arg ci_token=$CI_JOB_TOKEN --pull -t $IMAGE_TAG . + - podman tag $IMAGE_TAG $CI_REGISTRY_IMAGE:integration-test + - podman push $CI_REGISTRY_IMAGE:integration-test rules: - if: '$CI_COMMIT_BRANCH != "master"' when: never