Commit 16f4c9b1 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch 'fix_version_issue' into 'master' 

fix: fix issue when version for s2i is mentionned

Closes #1

See merge request to-be-continuous/s2i!2
parents 7fb384fa 35f08b9f

templates/gitlab-ci-s2i.yml

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ stages: 
    if [[ "$S2I_VERSION" == "latest" ]]; then

      release_path="latest"

    else

      release_path="/tags/$S2I_VERSION"

      release_path="tags/$S2I_VERSION"

    fi

    release_json=$(curl -sSf "https://api.github.com/repos/openshift/source-to-image/releases/$release_path")

    tag_name=$(echo "$release_json" | jq -r .tag_name)
@@ -456,7 +456,7 @@ s2i-build: 
    - s2i_tag=${S2I_SNAPSHOT_IMAGE##*:}

    - s2i_image_path=${s2i_repository#*/}

    # build image (see: https://github.com/openshift/source-to-image/blob/master/docs/cli.md#s2i-build)

    - '"$CI_PROJECT_DIR/.cache/s2i" build --url="tcp://docker:2375" "$S2I_ROOT_DIR" "$S2I_BUILDER_IMAGE" "$s2i_image_path" $S2I_BUILD_EXTRA_FLAGS'

    - '"$CI_PROJECT_DIR/.cache/s2i" build --url="tcp://docker:2375" "$S2I_ROOT_DIR" "$S2I_BUILDER_IMAGE" "$s2i_image_path" ${S2I_BUILD_EXTRA_FLAGS}'

    # push image (with skopeo)

    - 'skopeo copy --src-daemon-host http://docker:2375 --dest-authfile ~/.docker/config.json "docker-daemon:$s2i_image_path:latest" "docker://$S2I_SNAPSHOT_IMAGE"'

    # eval image digest