Commit dbb496c1 authored by Dmitriy Safronov's avatar Dmitriy Safronov
Browse files

fixes

parent 7eb5158c

gitlab-ci.yml

+5 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ buildkit: 
    name: $BUILDKIT_IMAGE

    entrypoint: ["sh", "-c"]

  variables:

    CACHE_DIR_SUFFIX: "buildkit"

    CACHE_FALLBACK_KEY: $CI_DEFAULT_BRANCH

  before_script:

    - test -z "${CUSTOM_IMAGENAME}" && export IMAGE_PATH="${CI_REGISTRY_IMAGE}" || export IMAGE_PATH="${CI_REGISTRY_IMAGE}/${CUSTOM_IMAGENAME}"
@@ -35,12 +36,13 @@ buildkit: 
    - |

      buildctl-daemonless.sh ${CUSTOM_BUILDKIT_COMMON_PARAMETERS} \

        build ${CUSTOM_BUILDKIT_BUILD_PARAMETERS} \

        --progress plain \

        --opt build-arg:DOCKER_REGISTRY="${CI_REGISTRY}" \

        --frontend dockerfile.v0 \

        --local context=${CUSTOM_BUILDPATH} \

        --local dockerfile=${CUSTOM_DOCKERFILE} \

        --import-cache type=local,src=.cache-buildkit \

        --export-cache type=local,dest=.cache-buildkit \

        --import-cache type=local,src=.cache-${CACHE_DIR_SUFFIX} \

        --export-cache type=local,dest=.cache-${CACHE_DIR_SUFFIX} \

        --output type=image,name="${IMAGE_PATH}:${CUSTOM_TAGPREFIX}-${CI_COMMIT_SHORT_SHA}",push=true

  rules:

    - if: '$CI_PIPELINE_SOURCE == "push"'
@@ -50,4 +52,4 @@ buildkit: 
  cache:

    key: "$CI_COMMIT_REF_SLUG"

    paths:

      - .cache-buildkit
 
      - .cache-${CACHE_DIR_SUFFIX}