diff options
| author | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-03-12 14:17:08 +0000 |
|---|---|---|
| committer | Olivier Gonzalez <ogonzalez@gitlab.com> | 2019-03-12 14:17:08 +0000 |
| commit | e8c3b0edfa784e37cbf44c0ad6ad8ea906af3f3a (patch) | |
| tree | 6efcd2e75d9c819e2d184a0d28dbc3e2febb9fdf | |
| parent | e63b46798e236c155a8f8ed15a7c7a48f2491fde (diff) | |
| parent | b69a4ad22fbb57d54a9c2d06b46139c1786e5bde (diff) | |
Merge branch 'fix-gitlab-ci-release-ref-for-v1' into 'master'
Fix: build commit CI stage should use Dockerfile.v1
See merge request gitlab-org/security-products/license-management!20
| -rw-r--r-- | .gitlab-ci.yml | 22 | ||||
| -rw-r--r-- | Dockerfile.v1 | 1 |
2 files changed, 0 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00f7beb..be21d2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,55 +144,33 @@ major: latest: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-9-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-8-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-7-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-6-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-5-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-4-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-3-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-2-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-1-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 11-0-stable: extends: .release - variables: - DOCKERFILE: Dockerfile.v1 diff --git a/Dockerfile.v1 b/Dockerfile.v1 deleted file mode 100644 index 01b4c16..0000000 --- a/Dockerfile.v1 +++ /dev/null @@ -1 +0,0 @@ -FROM registry.gitlab.com/gonzoyumo/license-management:1 |