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

fix

parent 4424c5b0

gitlab-ci.yml

+8 −8
Original line number Diff line number Diff line
@@ -4,11 +4,13 @@ 
variables:

  GIT_DEPTH: 1

  #

  CUSTOM_DOCKERFILE: "."

  CUSTOM_BUILDPATH: "."

  CUSTOM_TAGPREFIX: "temp"

  CUSTOM_IMAGENAME: ""

  # CUSTOM_DOCKERFILE: "."

  # CUSTOM_BUILDPATH: "."

  # CUSTOM_TAGPREFIX: "temp"

  # CUSTOM_IMAGENAME: ""

  #

  # Set this in Admin CI config

  ## CUSTOM_BUILDENGINE: buildkit-daemonless



##########################################################################################################
@@ -18,8 +20,6 @@ buildkit: 
  image:

    name: $BUILDKIT_IMAGE

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

  variables:

    CACHE_DIR_SUFFIX: "buildkit"

  script: |

    mkdir -p ~/.docker/

    echo "{\"auths\":{\"${CI_REGISTRY}\":{\"auth\":\"$(printf "%s:%s" "${CI_REGISTRY_USER}" "${CI_REGISTRY_PASSWORD}" | base64 | tr -d '\n')\"}}}" > ~/.docker/config.json
@@ -30,6 +30,6 @@ buildkit: 
      --frontend dockerfile.v0 \

      --local context=${CUSTOM_BUILDPATH} \

      --local dockerfile=${CUSTOM_DOCKERFILE} \

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

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

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

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

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