Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use jvmkill Docker image when building Trino image #17529

Merged
merged 1 commit into from
May 17, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions core/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM eclipse-temurin:17-jdk AS builder

RUN \
set -xeu && \
echo 'Acquire::Retries "3";' > /etc/apt/apt.conf.d/80-retries && \
echo 'Acquire::http::Timeout "15";' > /etc/apt/apt.conf.d/80-timeouts && \
apt-get update -q && \
apt-get install -y -q git gcc make && \
git clone https://github.com/airlift/jvmkill /tmp/jvmkill && \
make -C /tmp/jvmkill
FROM ghcr.io/airlift/jvmkill:latest AS jvmkill
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you avoid a specific tag intentionally?

Copy link
Member Author

@electrum electrum May 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I only published a latest tag since jvmkill is simple and is essentially unchanged since it was first created.


FROM eclipse-temurin:17-jdk

Expand All @@ -41,7 +32,7 @@ ARG TRINO_VERSION
COPY --chown=trino:trino trino-cli-${TRINO_VERSION}-executable.jar /usr/bin/trino
COPY --chown=trino:trino trino-server-${TRINO_VERSION} /usr/lib/trino
COPY --chown=trino:trino default/etc /etc/trino
COPY --chown=trino:trino --from=builder /tmp/jvmkill/libjvmkill.so /usr/lib/trino/bin
COPY --chown=trino:trino --from=jvmkill /libjvmkill.so /usr/lib/trino/bin

EXPOSE 8080
USER trino:trino
Expand Down