Edited the gitlab yml file, following errors during build
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 6
− 1
@@ -9,6 +9,9 @@ stages:
@@ -9,6 +9,9 @@ stages:
@@ -32,7 +35,8 @@ docker-build:
@@ -32,7 +35,8 @@ docker-build:
@@ -40,3 +44,4 @@ docker-build:
@@ -40,3 +44,4 @@ docker-build:
- docker build --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from $CI_REGISTRY_IMAGE:latest --tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA --tag $CI_REGISTRY_IMAGE:latest .