12 Commits

Author SHA1 Message Date
2f8508ee92 ci: Use multiline chomp in YAML
It put the backslashes right into the bash command bash didn't really like that.
Bash escaped spaces and that lead to a bad command
2020-12-29 16:21:29 +01:00
b036b9e8f8 ci: Quote variables properly 2020-12-29 10:47:08 +01:00
f36a500210 ci: Improve tag regex for pushing docker 2020-12-29 10:34:29 +01:00
dbcf640320 ci: Push README to dockerhub 2020-12-29 10:26:48 +01:00
08f2f9031d Add more comments to .gitlab-ci.yml 2020-12-29 01:07:27 +01:00
d40d687f6e ci: limit builds to tags with certain names 2020-12-29 01:05:21 +01:00
b12bf1bf22 docker: ignore IDE files 2020-12-29 00:55:38 +01:00
7bcc9344ec Use correct syntax to ignore folders for docker 2020-12-29 00:54:23 +01:00
f84eb3ce70 retrigger dockerhub build 2020-12-29 00:52:45 +01:00
f576588ec0 Trigger dockerhub build 2020-12-29 00:51:22 +01:00
0ae229792c Ignore .git in docker image 2020-12-29 00:45:16 +01:00
4e69e3d50b Try dockerhub again
There were protected variables involved...
2020-12-29 00:41:53 +01:00
2 changed files with 28 additions and 13 deletions

View File

@@ -1,4 +1,8 @@
# CI cache folder storing docker images
ci-exports/
.idea
.git
.gitlab-ci.yml
.vscode
# CI cache folder storing docker images
ci-exports

View File

@@ -23,18 +23,18 @@ variables:
# Use TLS https://docs.gitlab.com/ee/ci/docker/using_docker_build.html#tls-enabled
DOCKER_HOST: tcp://docker:2376
services:
- docker:19.03.12-dind
.docker_cache:
cache:
# The same key should be used across branches
key: "$CI_COMMIT_REF_SLUG"
paths:
- ci-exports/*.tar
services:
- docker:19.03.12-dind
# Make sure we can build a docker image
# It's pushed to the pipeline-local registry which acts as a cache
# It's cached for later jobs
build_docker:
extends:
- .docker_cache
@@ -62,11 +62,13 @@ push_ci_registry:
- docker push $CI_REGISTRY_IMAGE:latest
only:
refs:
- master
# Make sure to protect these tags!
- /^v(\d+\.){2,3}\d+$/
- /.+-release$/
variables:
- $CI_REGISTRY
- $CI_REGISTRY_USER
- $CI_REGISTRY_PASSWORD
- $CI_REGISTRY
- $CI_REGISTRY_IMAGE
# Publishes the cached image to docker
@@ -84,12 +86,21 @@ push_dockerhub_registry:
- docker tag $CI_REGISTRY_IMAGE:latest $DOCKERHUB_REGISTRY_IMAGE:latest
- docker push $DOCKERHUB_REGISTRY_IMAGE:$CI_COMMIT_TAG
- docker push $DOCKERHUB_REGISTRY_IMAGE:latest
# Push the readme to dockerhub
- >-
docker run -v $PWD:/workspace
-e DOCKERHUB_USERNAME="$DOCKERHUB_REGISTRY_USER"
-e DOCKERHUB_PASSWORD="$DOCKERHUB_REGISTRY_PASSWORD"
-e DOCKERHUB_REPOSITORY="$DOCKERHUB_REGISTRY_IMAGE"
-e README_FILEPATH='/workspace/README.md'
peterevans/dockerhub-description:2
only:
refs:
# - master
- tags
# Make sure to protect these tags!
- /^v(\d+\.){2,3}\d+$/
- /.+-release$/
variables:
- $DOCKERHUB_REGISTRY
- $DOCKERHUB_REGISTRY_USER
- $DOCKERHUB_REGISTRY_PASSWORD
- $DOCKERHUB_REGISTRY
- $DOCKERHUB_REGISTRY_IMAGE