Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
Pass Trino version to Dockerfile during release
  • Loading branch information
nineinchnick committed Apr 11, 2022
1 parent ce41449 commit 80b018d
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 2 additions & 0 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<parent>
<groupId>io.airlift</groupId>
<artifactId>airbase</artifactId>
<version>123</version>
<version>124</version>
</parent>

<licenses>
Expand All @@ -55,7 +55,7 @@
<air.check.skip-checkstyle>false</air.check.skip-checkstyle>

<!-- must be in sync with Dockerfile -->
<dep.trino.version>375</dep.trino.version>
<dep.trino.version>376</dep.trino.version>
<dep.airlift.version>215</dep.airlift.version>
<dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
<dep.errorprone.version>2.12.1</dep.errorprone.version>
Expand Down
8 changes: 4 additions & 4 deletions trino-cloud-aws/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trino-cloud-aws/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>bom</artifactId>
<version>2.17.164</version>
<version>2.17.167</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down

0 comments on commit 80b018d

Please sign in to comment.