Merge branch 'main' into fix-1328

apache · Jan 5, 2024 · 40145ac · 40145ac
2 parents 27e5ee4 + 89955d3
commit 40145ac
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/.github/workflows/auto-cherry-pick.yml b/.github/workflows/auto-cherry-pick.yml
@@ -19,6 +19,7 @@ jobs:
       - name: Cherry pick into branch-0.1
         uses: carloscastrojumo/[email protected]
         with:
+          token: ${{ secrets.BOT_TOKEN }}
           branch: branch-0.1
           labels: |
             cherry-pick
@@ -36,6 +37,7 @@ jobs:
       - name: Cherry pick into branch-0.2
         uses: carloscastrojumo/[email protected]
         with:
+          token: ${{ secrets.BOT_TOKEN }}
           branch: branch-0.2
           labels: |
             cherry-pick
@@ -53,6 +55,7 @@ jobs:
       - name: Cherry pick into branch-0.3
         uses: carloscastrojumo/[email protected]
         with:
+          token: ${{ secrets.BOT_TOKEN }}
           branch: branch-0.3
           labels: |
             cherry-pick

diff --git a/dev/docker/build-docker.sh b/dev/docker/build-docker.sh
@@ -75,6 +75,8 @@ else
   exit 1
 fi
 
+build_args="${build_args} --build-arg IMAGE_NAME=${image_name}"
+
 # Create multi-arch builder
 BUILDER_NAME="gravitino-builder"
 builders=$(docker buildx ls)

diff --git a/dev/docker/trino/Dockerfile b/dev/docker/trino/Dockerfile
@@ -45,11 +45,20 @@ RUN rm -rf /usr/lib/trino/plugin/accumulo  \
     && rm -rf /usr/lib/trino/plugin/redis \
     && rm -rf /usr/lib/trino/plugin/session-property-managers \
     && rm -rf /usr/lib/trino/plugin/teradata-functions
-
 COPY --chown=trino:trino packages/trino/conf /etc/trino
 COPY --chown=trino:trino packages/gravitino-trino-connector/mysql-connector-java-8.0.27.jar /usr/lib/trino/plugin/iceberg/
 COPY --chown=trino:trino packages/gravitino-trino-connector/postgresql-42.7.0.jar /usr/lib/trino/plugin/iceberg/
-COPY --chown=trino:trino packages/gravitino-trino-connector /usr/lib/trino/plugin/gravitino
+
+RUN mkdir /tmp/gravitino
+COPY --chown=trino:trino packages/gravitino-trino-connector /tmp/gravitino
+
+ARG IMAGE_NAME
+RUN if [ "$IMAGE_NAME" = "datastrato/trino" ] ; then \
+    mv /tmp/gravitino /usr/lib/trino/plugin/; \
+    else echo "Copying files for other images"; \
+    fi
+
+
 
 # Use ARGs to update trino conf and start Trino server
 ARG GRAVITINO_HOST_IP

diff --git a/docs/docker-image-details.md b/docs/docker-image-details.md
@@ -122,6 +122,9 @@ You can use this image to test Trino.
 
 Changelog
 
+- gravitino-ci-trino:0.1.3
+  - Remove copy content in folder `gravitino-trino-connector` to plugin folder `/usr/lib/trino/plugin/gravitino`
+
 - gravitino-ci-trino:0.1.2
   - Copy JDBC driver 'mysql-connector-java' and 'postgres' to `/usr/lib/trino/iceberg/` folder