From 2a78f448410253322f1d8a71e820bc146272f862 Mon Sep 17 00:00:00 2001 From: s3lph Date: Tue, 28 Sep 2021 01:01:00 +0200 Subject: [PATCH] Remove docker image from release process --- .gitlab-ci.yml | 29 +++++++++++++++-------------- package/release.py | 5 +++-- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 040a2bf..5e7dc32 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,20 +30,21 @@ codestyle: -build_docker: - stage: build - script: - - apt update && apt install --yes docker.io - - docker build -t "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" -f package/docker/Dockerfile . - - docker tag "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_REF_NAME" - - if [[ -n "$CI_COMMIT_TAG" ]]; then docker tag "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_TAG"; fi - - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com - - docker push "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" - - docker push "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_REF_NAME" - - if [[ -n "$CI_COMMIT_TAG" ]]; then docker push "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_TAG"; fi - only: - - staging - - tags +# currently not working for some reason +#build_docker: +# stage: build +# script: +# - apt update && apt install --yes docker.io +# - docker build -t "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" -f package/docker/Dockerfile . +# - docker tag "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_REF_NAME" +# - if [[ -n "$CI_COMMIT_TAG" ]]; then docker tag "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_TAG"; fi +# - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD registry.gitlab.com +# - docker push "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_SHA" +# - docker push "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_REF_NAME" +# - if [[ -n "$CI_COMMIT_TAG" ]]; then docker push "registry.gitlab.com/s3lph/easywks:$CI_COMMIT_TAG"; fi +# only: +# - staging +# - tags build_wheel: stage: build diff --git a/package/release.py b/package/release.py index 42d3284..07f6a54 100755 --- a/package/release.py +++ b/package/release.py @@ -122,8 +122,9 @@ def main(): ### Download - [Python Wheel]({wheel_url}) ([sha256]({wheel_sha_url})) -- [Debian Package]({debian_url}) ([sha256]({debian_sha_url})) -- Docker image: registry.gitlab.com/{project_name}:{release_tag}''' +- [Debian Package]({debian_url}) ([sha256]({debian_sha_url}))''' + # Docker currently not working + # - Docker image: registry.gitlab.com/{project_name}:{release_tag} post_body: str = json.dumps({ 'tag_name': release_tag,