From 6c75ea17da86ea4f6a72ad75d5c64823453ca900 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 19 Oct 2023 09:47:01 +0300
Subject: Revert "Revert "exp: switch to kaniko""

This reverts commit b07ad642ded470f3ec5b30b52e85b42637aa8f60.
---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b28067f2..f11fa7931 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.yml
+    file: .ci-build-docker-kaniko.yml
   - project: 'ci/ci-templates'
     ref: master
     file: .ci-lint-common.yml
@@ -25,22 +25,22 @@ phpstan:
 ttrss-web-nginx:
   extends: .build-master
   variables:
-    BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx
+    DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
 
 ttrss-web-nginx:branch:
   extends: .build-branch
   variables:
-    BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/web-nginx
+    DOCKERFILE: ${CI_PROJECT_DIR}/.docker/web-nginx/Dockerfile
 
 ttrss-fpm-pgsql-static:
    extends: .build-master
    variables:
-    BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app
+    DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
 
 ttrss-fpm-pgsql-static:branch:
    extends: .build-branch
    variables:
-    BUILD_CONTEXT: ${CI_PROJECT_DIR}/.docker/app
+    DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile
 
 phpdoc:
   image: ${PHP_IMAGE}
-- 
cgit v1.2.3