Commit 95c9b6d
committed
chore(ci): add automatic GitLab image pushes
1 parent e45a6e2 commit 95c9b6d
4 files changed
Lines changed: 30 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -26,19 +26,19 @@ black_lint: | |||
| 26 | 26 | except: | |
| 27 | 27 | - master | |
| 28 | 28 | ||
| 29 | - #build_test_image: # Currently hangs forever, because of GitLab Runner infrastructure issues | ||
| 30 | - # stage: build-test-image | ||
| 31 | - # image: | ||
| 32 | - # name: gcr.io/kaniko-project/executor:debug | ||
| 33 | - # entrypoint: [""] | ||
| 34 | - # script: | ||
| 35 | - # - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json | ||
| 36 | - # - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/tools/Dockerfile-test --destination $CI_REGISTRY_IMAGE:test | ||
| 37 | - # only: | ||
| 38 | - # refs: | ||
| 39 | - # - master | ||
| 40 | - # changes: | ||
| 41 | - # - tools/ | ||
| 29 | + build_test_image: | ||
| 30 | + stage: build-test-image | ||
| 31 | + image: | ||
| 32 | + name: gcr.io/kaniko-project/executor:debug | ||
| 33 | + entrypoint: [""] | ||
| 34 | + script: | ||
| 35 | + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json | ||
| 36 | + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/tools/Dockerfile-test --destination $CI_REGISTRY_IMAGE:test | ||
| 37 | + only: | ||
| 38 | + refs: | ||
| 39 | + - master | ||
| 40 | + changes: | ||
| 41 | + - tools/ | ||
| 42 | 42 | ||
| 43 | 43 | .tox_includes: &tox_includes | |
| 44 | 44 | stage: test | |
@@ -103,3 +103,14 @@ deploy: | |||
| 103 | 103 | - twine upload --skip-existing -u $TWINE_USERNAME -p $TWINE_PASSWORD dist/* | |
| 104 | 104 | only: | |
| 105 | 105 | - tags | |
| 106 | + | ||
| 107 | + deploy_image: | ||
| 108 | + stage: deploy | ||
| 109 | + image: | ||
| 110 | + name: gcr.io/kaniko-project/executor:debug | ||
| 111 | + entrypoint: [""] | ||
| 112 | + script: | ||
| 113 | + - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json | ||
| 114 | + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG | ||
| 115 | + only: | ||
| 116 | + - tags | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -55,8 +55,11 @@ How to use | |||
| 55 | 55 | ||
| 56 | 56 | ``docker run -it --rm -e GITLAB_PRIVATE_TOKEN=<your token> -v /path/to/python-gitlab.cfg:/python-gitlab.cfg python-gitlab <command> ...`` | |
| 57 | 57 | ||
| 58 | - To change the GitLab URL, use `-e GITLAB_URL=<your url>` | ||
| 58 | + or run it directly from the upstream image: | ||
| 59 | + | ||
| 60 | + ``docker run -it --rm -e GITLAB_PRIVATE_TOKEN=<your token> -v /path/to/python-gitlab.cfg:/python-gitlab.cfg registry.gitlab.com/python-gitlab/python-gitlab:v1.8.0 <command> ...`` | ||
| 59 | 61 | ||
| 62 | + To change the GitLab URL, use `-e GITLAB_URL=<your url>` | ||
| 60 | 63 | ||
| 61 | 64 | Bring your own config file: | |
| 62 | 65 | ``docker run -it --rm -v /path/to/python-gitlab.cfg:/python-gitlab.cfg -e GITLAB_CFG=/python-gitlab.cfg python-gitlab <command> ...`` | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,7 @@ RUN apt-get update \ | |||
| 11 | 11 | tzdata \ | |
| 12 | 12 | && curl https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | bash \ | |
| 13 | 13 | && apt-get install -qy --no-install-recommends \ | |
| 14 | - gitlab-ce=11.10.0-ce.0 | ||
| 14 | + gitlab-ce=11.11.2-ce.0 | ||
| 15 | 15 | ||
| 16 | 16 | # Manage SSHD through runit | |
| 17 | 17 | RUN mkdir -p /opt/gitlab/sv/sshd/supervise \ | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -77,7 +77,7 @@ cleanup() { | |||
| 77 | 77 | } | |
| 78 | 78 | ||
| 79 | 79 | try docker run --name gitlab-test --detach --publish 8080:80 \ | |
| 80 | - --publish 2222:22 pythongitlab/test-python-gitlab:latest >/dev/null | ||
| 80 | + --publish 2222:22 registry.gitlab.com/python-gitlab/python-gitlab:test >/dev/null | ||
| 81 | 81 | ||
| 82 | 82 | LOGIN='root' | |
| 83 | 83 | PASSWORD='5iveL!fe' | |
0 commit comments