From 39456c09b0cac4be415b530d188c73236c974442 Mon Sep 17 00:00:00 2001
From: Matthew Peveler <matt@popsql.com>
Date: Mon, 20 Nov 2023 09:41:20 -0500
Subject: [PATCH] fix Dockerfile putting tar under /opt/presto-server

---
 .github/workflows/build.yml |  2 ++
 Dockerfile                  | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 24f5944..8be6886 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,3 +50,5 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            PRESTO_VERSION=${{ inputs.version }}
diff --git a/Dockerfile b/Dockerfile
index 1baa7ca..676530b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,11 +3,8 @@ FROM amazoncorretto:11-alpine
 EXPOSE 8080
 
 ENV PRESTO_HOME=/opt/presto-server
-WORKDIR /opt/presto-server
-
-CMD ["/bin/sh", "-c", "./bin/launcher run"]
 
-ARG PRESTO_VERSION=0.281
+ARG PRESTO_VERSION
 ARG PRESTO_PKG=presto-server-${PRESTO_VERSION}.tar.gz
 ARG PRESTO_PKG_URL=https://repo1.maven.org/maven2/com/facebook/presto/presto-server/${PRESTO_VERSION}/${PRESTO_PKG}
 
@@ -27,4 +24,7 @@ RUN apk add --no-cache \
   && ln -s /opt/presto-cli /usr/local/bin/presto \
   && apk del curl tar
 
-ADD etc etc/
+ADD etc /opt/presto-server/etc/
+
+WORKDIR /opt/presto-server
+CMD ["/bin/sh", "-c", "./bin/launcher run"]