diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74c885391ea05da83d42b8c14e8fdefdc0c8a986..e57a746e0e6301911a436e81b64f24c0dd95dc2c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ build: #This will be executed on every push. It builds an docker image, which is script: - echo "building for branch $CI_COMMIT_REF_NAME" - sudo docker image prune -f #Delete old unused images + - sudo docker pull python:3 - sudo docker build -t gitlab.jonasled.de/jonasled/url_shorter_docker:$CI_COMMIT_REF_NAME . #Build the image with the name already set to push - sudo docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY #Login to docker registry, username and password will be filled while executing - sudo docker push gitlab.jonasled.de/jonasled/url_shorter_docker:$CI_COMMIT_REF_NAME #Push the image onto the Docker registry. @@ -30,6 +31,7 @@ build-release: #This will be executed if you push on master, it makes a new rele - echo "building branch $CI_COMMIT_REF_NAME, Version $version" - 'curl -X POSRT --silent --show-error --fail --header "PRIVATE-TOKEN: ${GITLAB_TOKEN}"https://gitlab.jonasled.de/api/v4/projects/${CI_PROJECT_ID}/repository/tags?tag_name=$version&ref=${CI_COMMIT_SHS}' #Tag the current commit with the version. - sudo docker image prune -f #Delete old unused images + - sudo docker pull python:3 - sudo docker build -t gitlab.jonasled.de/jonasled/url_shorter_docker . #Build the image with the name already set to push - sudo docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY #Login to docker registry, username and password will be filled while executing - sudo docker push gitlab.jonasled.de/jonasled/url_shorter_docker #Push the image onto the Docker registry. diff --git a/VERSION b/VERSION index a73b432544448dccf8814bfa830a722e78ba83c0..2eda823ff528e35b882a34d83aebc180b0a21f89 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.2 \ No newline at end of file +1.6.1 \ No newline at end of file