From 08015d43eb99cea249c32245598764d9838c0d20 Mon Sep 17 00:00:00 2001
From: Yannick Marcon <yannick.marcon@obiba.org>
Date: Fri, 30 Aug 2024 12:12:41 +0200
Subject: [PATCH] fix: use ubuntu jammy, python install to be fixed for noble

---
 Dockerfile         | 6 +++---
 Makefile           | 2 +-
 docker-compose.yml | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8d4afca..6c5bf33 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@
 FROM tianon/gosu:latest AS gosu
 
 
-FROM docker.io/library/eclipse-temurin:8-jre AS server
+FROM docker.io/library/eclipse-temurin:8-jre-jammy AS server
 
 ENV OPAL_ADMINISTRATOR_PASSWORD password
 ENV OPAL_HOME /srv
@@ -27,14 +27,14 @@ ENV VALIDATE_PLUGIN_VERSION=1.1.0
 WORKDIR /tmp
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
-    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y daemon psmisc apt-transport-https unzip curl pipx python3-pip libcurl4-openssl-dev libssl-dev adduser && \
+    DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y daemon psmisc apt-transport-https unzip curl python3-pip libcurl4-openssl-dev libssl-dev && \
     apt-get clean &&  \
     rm -rf /var/lib/apt/lists/*
 
 COPY --from=gosu /usr/local/bin/gosu /usr/local/bin/
 
 # Install Opal Python Client
-RUN pipx ensurepath && pipx install obiba-opal
+RUN pip install obiba-opal
 
 # Install Opal Server
 RUN set -x && \
diff --git a/Makefile b/Makefile
index d1644d6..e91ca47 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ all:
 
 # Build Docker image
 build:
-	sudo docker build --no-cache=$(no_cache) --progress=plain -t="obiba/opal:$(tag)" .
+	sudo docker build --pull --no-cache=$(no_cache) --progress=plain -t="obiba/opal:$(tag)" .
 
 push:
 	sudo docker image push obiba/opal:$(tag)
diff --git a/docker-compose.yml b/docker-compose.yml
index 239428c..301f5dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,6 +2,7 @@ version: '3'
 services:
         opal:
                 image: obiba/opal:latest
+                #image: obiba/opal:test
                 ports:
                         - "8880:8080"
                 links: