jonny/matemat
1
0
Fork 0
forked from s3lph/matemat
Code Pull requests Activity

Fixed docker build task

Browse source
This commit is contained in:
s3lph 2018-11-04 02:51:57 +01:00
parent 2e92d1c1ab
commit cc34d72c73
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitlab-ci.yml
View file

@ -32,12 +32,15 @@ codestyle:
build_docker: build_docker:
stage: build stage: build
script: script:
- docker build -t "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" package/docker - docker build -t "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" -f package/docker/Dockerfile .
- docker tag "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_REF_NAME" - docker tag "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_REF_NAME"
- '[[ -n "$CI_COMMIT_TAG" ]] && docker tag "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_TAG"'
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_TOKEN registry.gitlab.com - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_TOKEN registry.gitlab.com
- docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA" - docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_SHA"
- docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_REF_NAME" - docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_REF_NAME"
- '[[ -n "$CI_COMMIT_TAG" ]] && docker push "registry.gitlab.com/s3lph/matemat:$CI_COMMIT_TAG"'
only: only:
- 27-deployment
- staging - staging
- master - master
- tags - tags

3
package/release.py
View file

@ -98,7 +98,8 @@ def main():
- [Python Wheel]({wheel_url}) ([sha256]({wheel_sha_url})) - [Python Wheel]({wheel_url}) ([sha256]({wheel_sha_url}))
- [Debian Package]({debian_url}) ([sha256]({debian_sha_url})) - [Debian Package]({debian_url}) ([sha256]({debian_sha_url}))
- [Arch Linux Package]({arch_url}) ([sha256]({arch_sha_url}))''' - [Arch Linux Package]({arch_url}) ([sha256]({arch_sha_url}))
- Docker image: registry.gitlab.com/{project_name}:{release_tag}'''
encoder = json.encoder.JSONEncoder() encoder = json.encoder.JSONEncoder()
decoder = json.decoder.JSONDecoder() decoder = json.decoder.JSONDecoder()