Skip to content

Commit dba5487

Browse files
committed
Merge branch 'docker-tags-for-external-pipelines' into 'master'
fix: run pipeline jobs from forks See merge request postgres-ai/database-lab!431
2 parents 44b9580 + b35288f commit dba5487

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ build-image-feature-server:
157157
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
158158
REGISTRY: "${CI_REGISTRY}"
159159
DOCKER_FILE: "Dockerfile.dblab-server"
160-
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-server"
160+
DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/dblab-server"
161161
TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}"
162162

163163
build-image-feature-ci-checker:
@@ -168,7 +168,7 @@ build-image-feature-ci-checker:
168168
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
169169
REGISTRY: "${CI_REGISTRY}"
170170
DOCKER_FILE: "Dockerfile.ci-checker"
171-
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-ci-checker"
171+
DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/dblab-ci-checker"
172172
TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}"
173173

174174
build-image-feature-client:
@@ -179,7 +179,7 @@ build-image-feature-client:
179179
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
180180
REGISTRY: "${CI_REGISTRY}"
181181
DOCKER_FILE: "Dockerfile.dblab-cli"
182-
DOCKER_NAME: "registry.gitlab.com/postgres-ai/database-lab/dblab-cli"
182+
DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/dblab-cli"
183183
TAGS: "${DOCKER_NAME}:${CI_COMMIT_REF_SLUG}"
184184

185185
build-image-master-server:
@@ -359,7 +359,9 @@ build-image-swagger-latest:
359359
- changes:
360360
- web/**/*
361361
when: never
362-
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH'
362+
- if: '$CI_PROJECT_NAMESPACE != "postgres-ai"'
363+
when: never
364+
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
363365
changes:
364366
- cmd/**/*
365367
- configs/**/*

0 commit comments

Comments
 (0)