change strawberry docker tag

ytsaurus · Sep 28, 2023 · 2efe713 · 2efe713
1 parent de36a00
commit 2efe713
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 48 deletions.
diff --git a/.github/workflows/build-jobs.yaml b/.github/workflows/build-jobs.yaml
@@ -41,7 +41,7 @@ jobs:
           /opt/go/bin/go build
 
       - name: Configure ytsaurus
-        if: ${{ inputs.build-ytsaurus || inputs.build-chyt || inputs.build-query-tracker || inputs.build-python }}
+        if: ${{ inputs.build-ytsaurus || inputs.build-chyt || inputs.build-query-tracker }}
         run: |
           mkdir -p ../build
           cd ../build
@@ -55,7 +55,7 @@ jobs:
             ../ytsaurus/ytsaurus
 
       - name: Configure ytsaurus (relwithdebinfo)
-        if: ${{ inputs.build-ytsaurus || inputs.build-chyt || inputs.build-query-tracker || inputs.build-python }}
+        if: ${{ inputs.build-ytsaurus || inputs.build-chyt || inputs.build-query-tracker }}
         run: |
           mkdir -p ../build_relwithdebinfo
           cd ../build_relwithdebinfo
@@ -111,7 +111,7 @@ jobs:
             ../ytsaurus/ydb
 
       - name: Build ytsaurus
-        if: ${{ inputs.build-ytsaurus || inputs.build-chyt || inputs.build-query-tracker || inputs.build-python }}
+        if: ${{ inputs.build-ytsaurus || inputs.build-chyt || inputs.build-query-tracker }}
         run: |
           export CCACHE_BASEDIR="$(realpath ..)"
           export CCACHE_REMOTE_ONLY=true

diff --git a/.github/workflows/docker-jobs.yaml b/.github/workflows/docker-jobs.yaml
@@ -88,7 +88,7 @@ jobs:
           mkdir -p ../docker-strawberry-build
           IMAGE_TAG=${{ inputs.image-tag }}
 
-          bash ./ytsaurus/yt/docker/strawberry/build.sh --ytsaurus-source-path $(pwd)/ytsaurus --ytsaurus-build-path ../build --output-path ../docker-strawberry-build --image-tag ${IMAGE_TAG}
+          bash ./ytsaurus/yt/docker/strawberry/build.sh --ytsaurus-source-path $(pwd)/ytsaurus --output-path ../docker-strawberry-build --image-tag ${IMAGE_TAG}
 
           docker push ytsaurus/strawberry:${IMAGE_TAG}
 

diff --git a/.github/workflows/strawberry_release.yaml b/.github/workflows/strawberry_release.yaml
@@ -48,7 +48,6 @@ jobs:
     with:
       runs-on-value: ${{ needs.start-vm.outputs.label }}
       build-strawberry: true
-      build-python: true
     uses: ./.github/workflows/build-jobs.yaml
 
   tag:
@@ -63,7 +62,7 @@ jobs:
       - name: Parse tag
         id: tag
         run: |
-          echo "IMAGE_TAG=$(echo ${GITHUB_REF#refs/*/yt/chyt/controller/})" >> $GITHUB_OUTPUT
+          echo "IMAGE_TAG=$(echo ${GITHUB_REF#refs/*/yt/chyt/controller/v})" >> $GITHUB_OUTPUT
 
   release:
     name: Release

diff --git a/yt/docker/strawberry/Dockerfile b/yt/docker/strawberry/Dockerfile
@@ -9,38 +9,3 @@ RUN ln -s /usr/bin/strawberry-controller /usr/bin/chyt-controller
 
 # CREDITS files with licenses for all binaries.
 COPY ./credits/chyt-controller.CREDITS /usr/bin/strawberry-controller.CREDITS
-
-RUN apt-get update && apt-get install -y software-properties-common
-RUN add-apt-repository ppa:deadsnakes/ppa
-
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \
-  curl \
-  less \
-  gdb \
-  lsof \
-  strace \
-  telnet \
-  dnsutils \
-  iputils-ping \
-  lsb-release \
-  python3.7 \
-  python3-pip \
-  libidn11-dev \
-  python3.7-distutils
-
-COPY ./ytsaurus_python /tmp/ytsaurus_python
-RUN for package in client yson local native_driver; \
-  do \
-    dist_dir="/tmp/ytsaurus_python/ytsaurus_${package}_dist"; \
-    wheel_path="${dist_dir}/$(ls ${dist_dir} | grep "^ytsaurus_$package.*whl$")"; \
-    echo "DIST_DIR: ${dist_dir}"; \
-    echo "WHEEL_PATH: ${wheel_path}"; \
-    python3.7 -m pip install ${wheel_path}; \
-  done
-
-# Default python to be used by python3 jobs, for compatibility with jupyter tutorial.
-RUN ln -s /usr/bin/python3.7 /usr/bin/python3 -f
-# Force lsb_release to use python it was born to use.
-RUN sed -i 's/python3/python3.8/' /usr/bin/lsb_release
-
-RUN ln -s /usr/local/bin/yt /usr/bin/yt -f
diff --git a/yt/docker/strawberry/build.sh b/yt/docker/strawberry/build.sh
@@ -4,14 +4,12 @@ script_name=$0
 
 image_tag=""
 ytsaurus_source_path="."
-ytsaurus_build_path="."
 output_path="."
 
 print_usage() {
     cat << EOF
 Usage: $script_name [-h|--help]
                     [--ytsaurus-source-path /path/to/ytsaurus.repo (default: $ytsaurus_source_path)]
-                    [--ytsaurus-build-path /path/to/ytsaurus.build (default: $ytsaurus_build_path)]
                     [--output-path /path/to/output (default: $output_path)]
                     [--image-tag some-tag (default: $image_tag)]
 EOF
@@ -26,10 +24,6 @@ while [[ $# -gt 0 ]]; do
         ytsaurus_source_path="$2"
         shift 2
         ;;
-        --ytsaurus-build-path)
-        ytsaurus_build_path="$2"
-        shift 2
-        ;;
         --output-path)
         output_path="$2"
         shift 2
@@ -55,7 +49,6 @@ ytsaurus_credits="${ytsaurus_source_path}/yt/docker/ytsaurus/credits"
 dockerfile="${ytsaurus_source_path}/yt/docker/strawberry/Dockerfile"
 
 cp ${strawberry_controller} ${output_path}
-cp -r ${ytsaurus_build_path}/ytsaurus_python ${output_path}
 cp ${dockerfile} ${output_path}
 
 mkdir ${output_path}/credits