build: use focal-based prod image; update delta-sharing-server to v1.0.4

unicef · Mar 15, 2024 · 560415d · 560415d
1 parent 3cd783b
commit 560415d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -163,3 +163,4 @@ cython_debug/
 .task/
 conf/
 secrets.yaml
+profile.json
diff --git a/delta.dev.Dockerfile b/delta.dev.Dockerfile
@@ -1,22 +1,18 @@
-FROM maven:3.9-eclipse-temurin-11-alpine AS base
+FROM maven:3.9-eclipse-temurin-11-focal
 
-FROM base AS build
+RUN apt update && \
+    apt install -y wget unzip && \
+    apt clean
 
-WORKDIR /tmp/custom-sas-provider
-
-COPY ./custom-sas-provider ./
-
-RUN mvn clean package
-
-FROM base AS dev
+ARG DELTA_SHARING_VERSION=1.0.4
 
 WORKDIR /tmp
 
-RUN wget https://github.com/delta-io/delta-sharing/releases/download/v1.0.4/delta-sharing-server-1.0.4.zip && \
-    unzip delta-sharing-server-1.0.4.zip
+RUN wget "https://github.com/delta-io/delta-sharing/releases/download/v$DELTA_SHARING_VERSION/delta-sharing-server-$DELTA_SHARING_VERSION.zip" && \
+    unzip "delta-sharing-server-$DELTA_SHARING_VERSION.zip"
 
 WORKDIR /app
 
-RUN cp -R /tmp/delta-sharing-server-1.0.4/* ./
+RUN cp -R /tmp/delta-sharing-server-$DELTA_SHARING_VERSION/* ./
 
 CMD [ "./bin/delta-sharing-server", "--", "--config", "./conf/delta-sharing-server.yaml" ]
diff --git a/delta.prod.Dockerfile b/delta.prod.Dockerfile
@@ -1,17 +1,20 @@
-FROM maven:3.9-eclipse-temurin-11-alpine AS deps
+FROM maven:3.9-eclipse-temurin-11-focal AS deps
 
-ARG DELTA_SHARING_VERSION=1.0.3
+ARG DELTA_SHARING_VERSION=1.0.4
+
+RUN apt update && \
+    apt install -y wget unzip && \
+    apt clean
 
 WORKDIR /tmp
 
 RUN wget "https://github.com/delta-io/delta-sharing/releases/download/v$DELTA_SHARING_VERSION/delta-sharing-server-$DELTA_SHARING_VERSION.zip" && \
     unzip "delta-sharing-server-$DELTA_SHARING_VERSION.zip" && \
     mv "delta-sharing-server-$DELTA_SHARING_VERSION" delta-sharing-server
 
-FROM eclipse-temurin:11-jre-alpine
+FROM eclipse-temurin:11-jre-alpine as prod
 
-RUN apk add bash && \
-    apk cache clean
+RUN apk add --no-cache bash libc6-compat
 
 WORKDIR /app
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "giga-data-sharing"
-version = "0.2.0"
+version = "0.3.0"
 description = ""
 authors = ["Thinking Machines <[email protected]>"]
 readme = "README.md"
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,3 +163,4 @@ cython_debug/ @@
     .task/
     conf/
     secrets.yaml
+    profile.json