diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebfd8ce6..13a8c51b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,6 @@ cache: &global_cache_policy stages: - build - test - - release build: stage: build @@ -46,51 +45,4 @@ test: key: '$CI_COMMIT_SHORT_SHA' policy: pull script: - - yarn test - -docker: - stage: release - image: docker:latest - cache: {} - dependencies: [] - variables: &docker-variables - IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA - IMAGE_TAG_SLUG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG - IMAGE_TAG_LATEST: $CI_REGISTRY_IMAGE:latest - IMAGE_TAG_LATEST_STABLE: $CI_REGISTRY_IMAGE:stable - before_script: &before-docker - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - - docker pull $IMAGE_TAG_SLUG || true - - export CI_JOB_TIMESTAMP=$(date --utc -Iseconds) - - export CI_VCS_REF=$CI_COMMIT_SHORT_SHA - allow_failure: true - script: - - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST . - - docker push $IMAGE_TAG - - docker push $IMAGE_TAG_SLUG - - docker push $IMAGE_TAG_LATEST - tags: - - dind - only: - - develop@pleroma/admin-fe - - /^(features|ci)\/.*/@jp/admin-fe - -docker-stable: - stage: release - image: docker:latest - cache: {} - dependencies: [] - variables: *docker-variables - before_script: *before-docker - allow_failure: true - script: - - docker build --cache-from $IMAGE_TAG_SLUG --build-arg VCS_REF=$CI_VCS_REF --build-arg BUILD_DATE=$CI_JOB_TIMESTAMP -t $IMAGE_TAG -t $IMAGE_TAG_SLUG -t $IMAGE_TAG_LATEST_STABLE . - - docker push $IMAGE_TAG - - docker push $IMAGE_TAG_SLUG - - docker push $IMAGE_TAG_LATEST_STABLE - tags: - - dind - only: - - stable@pleroma/admin-fe - - + - yarn test \ No newline at end of file