diff options
| author | Andrew Dolgov <[email protected]> | 2023-10-19 09:21:49 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2023-10-19 09:21:49 +0300 |
| commit | b07ad642ded470f3ec5b30b52e85b42637aa8f60 (patch) | |
| tree | 2b13d05516b1e221ec171d8c0a2824cda3eb0f4b /.gitlab-ci.yml | |
| parent | 56315b39b46c8bf05ed9842b547b7d8ef5bfe526 (diff) | |
Revert "exp: switch to kaniko"
This reverts commit 56315b39b46c8bf05ed9842b547b7d8ef5bfe526.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f11fa7931..8b28067f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ variables: include: - project: 'ci/ci-templates' ref: master - file: .ci-build-docker-kaniko.yml + file: .ci-build-docker.yml - project: 'ci/ci-templates' ref: master file: .ci-lint-common.yml @@ -25,22 +25,22 @@ phpstan: ttrss-web-nginx: extends: .build-master variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx ttrss-web-nginx:branch: extends: .build-branch variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx ttrss-fpm-pgsql-static: extends: .build-master variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app ttrss-fpm-pgsql-static:branch: extends: .build-branch variables: - DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile + BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app phpdoc: image: ${PHP_IMAGE} |