diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index 7eea6c3..17f2194 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' @@ -30,7 +30,7 @@ jobs: AWS_REGION: eu-central-1 run: sh ./mvnw -B package - name: Upload test report - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: test report ${{ github.job }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index e4b918a..7b7724a 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -11,7 +11,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: '11' distribution: 'adopt' @@ -57,7 +57,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload test report - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 if: always() with: name: test report ${{ github.job }} diff --git a/Dockerfile b/Dockerfile index eb5edd1..c0272e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# Must be in sync with ${dep.trino.version} in pom.xml -FROM trinodb/trino:375 +ARG TRINO_VERSION +FROM trinodb/trino:$TRINO_VERSION ARG VERSION diff --git a/docker-build.sh b/docker-build.sh index b1feab5..7c06835 100644 --- a/docker-build.sh +++ b/docker-build.sh @@ -8,11 +8,13 @@ if [ -f release.properties ]; then else VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) fi +TRINO_VERSION=$(mvn help:evaluate -Dexpression=dep.trino.version -q -DforceStdout) TAG=nineinchnick/trino-cloud:$VERSION docker buildx build \ --platform linux/amd64,linux/arm64 \ -t "$TAG" \ + --build-arg TRINO_VERSION="$TRINO_VERSION" \ --build-arg VERSION="$VERSION" \ --push \ . diff --git a/pom.xml b/pom.xml index ceb71e4..fc4c09f 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ io.airlift airbase - 123 + 124 @@ -55,7 +55,7 @@ false - 375 + 376 215 ${dep.airlift.version} 2.12.1 diff --git a/trino-cloud-aws/README.md b/trino-cloud-aws/README.md index 90f991f..052cbb0 100644 --- a/trino-cloud-aws/README.md +++ b/trino-cloud-aws/README.md @@ -14,7 +14,7 @@ docker run \ -e AWS_SECRET_ACCESS_KEY \ -e AWS_REGION \ -p 8080:8080 \ - nineinchnick/trino-cloud:0.15 + nineinchnick/trino-cloud:0.18 ``` Then use your favourite SQL client to connect to Trino running at http://localhost:8080 @@ -98,19 +98,19 @@ An example command to run the Trino server with the aws plugin and catalog enabl ```bash src=$(git rev-parse --show-toplevel) docker run \ - -v $src/trino-cloud-aws/target/trino-cloud-aws-0.15-SNAPSHOT:/usr/lib/trino/plugin/aws \ + -v $src/trino-cloud-aws/target/trino-cloud-aws-0.19-SNAPSHOT:/usr/lib/trino/plugin/aws \ -e AWS_ACCESS_KEY_ID \ -e AWS_SECRET_ACCESS_KEY \ -e AWS_REGION \ -p 8080:8080 \ --name trino \ -d \ - trinodb/trino:375 + trinodb/trino:376 ``` Connect to that server using: ```bash -docker run -it --rm --link trino trinodb/trino:375 trino --server trino:8080 --catalog aws --schema default +docker run -it --rm --link trino trinodb/trino:376 trino --server trino:8080 --catalog aws --schema default ``` # Adding new tables diff --git a/trino-cloud-aws/pom.xml b/trino-cloud-aws/pom.xml index 14ead8d..e0cf729 100644 --- a/trino-cloud-aws/pom.xml +++ b/trino-cloud-aws/pom.xml @@ -36,7 +36,7 @@ software.amazon.awssdk bom - 2.17.164 + 2.17.167 pom import