- 3.11dev2 from test.pypi.org

Author: gpappsoft

Changelog

@@ -1,16 +1,4 @@
-Version 3.10.2, 2025-01-30
+Version 3.11dev2, 2025-02-05
 
-  Enhancements:
-  * Removed bash scripting including shaky logic
-  * NGINX Template including landing site if container is not ready yet
-  * More values for pi.cfg
-  * Removed unecessary binds
-  * New persistent logic, file location inside container (app, configuration,...)
-
-Changed:
-  * Using entrypoint.py instead of bash script
-  * Using privacyIDEA application context calls for entrypoint.py (create_db...)
-
-  Fixes:
-  * Fix some minor problems
+  Release for testing
 

Dockerfile

@@ -5,8 +5,8 @@
 FROM cgr.dev/chainguard/wolfi-base AS builder
 
 ARG PYVERSION=3.12
-ARG PI_VERSION=3.10.2
-ARG PI_REQUIREMENTS=3.10.2
+ARG PI_VERSION=3.11dev2
+ARG PI_REQUIREMENTS=3.11dev2
 ARG GUNICORN==23.0.0
 ARG PSYCOPG2==2.9.10
 ARG PYKCS11==1.5.14
@@ -23,14 +23,15 @@ RUN apk add python-${PYVERSION} py${PYVERSION}-pip python3-dev && \
 
 USER nonroot
 RUN python -m venv /privacyidea/venv
-RUN pip install -r https://raw.githubusercontent.com/privacyidea/privacyidea/v${PI_REQUIREMENTS}/requirements.txt 
-RUN pip install psycopg2-binary==${PSYCOPG2} privacyidea==${PI_VERSION} gunicorn==${GUNICORN}  
+RUN pip install -r https://raw.githubusercontent.com/privacyidea/privacyidea/refs/tags/v${PI_REQUIREMENTS}/requirements.txt
+RUN pip install psycopg2-binary==${PSYCOPG2} gunicorn==${GUNICORN} 
+RUN pip install -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple privacyIDEA==${PI_VERSION}
 #RUN pip install -r https://raw.githubusercontent.com/privacyidea/privacyidea/v${PI_REQUIREMENTS}/requirements-kerberos.txt 
 # Workaroud for https://github.com/privacyidea/privacyidea/issues/4127
 #RUN pip install -r https://raw.githubusercontent.com/privacyidea/privacyidea/v${PI_REQUIREMENTS}/requirements-hsm.txt 
 #RUN pip install pykcs11==${PYKCS11}
 
-ADD https://raw.githubusercontent.com/privacyidea/privacyidea/v${PI_REQUIREMENTS}/deploy/privacyidea/NetKnights.pem /privacyidea/etc/persistent/
+ADD https://raw.githubusercontent.com/privacyidea/privacyidea/refs/tags/v${PI_REQUIREMENTS}/deploy/privacyidea/NetKnights.pem /privacyidea/etc/persistent/
 
 COPY  conf/pi.cfg /privacyidea/etc/
 COPY  conf/logging.cfg /privacyidea/etc/

Makefile

@@ -1,5 +1,5 @@
-PI_VERSION := 3.10.2
-PI_VERSION_BUILD := 3.10.2
+PI_VERSION := "3.11dev2"
+PI_VERSION_BUILD := "3.11dev2"
 IMAGE_NAME := privacyidea-docker:${PI_VERSION}
 
 BUILDER := docker build

README.md

@@ -66,7 +66,7 @@ Sample images from this project can be found here:
 | [ghcr.io](https://github.com/gpappsoft/privacyidea-docker/pkgs/container/privacyidea-docker)| ```docker pull ghcr.io/gpappsoft/privacyidea-docker:latest```|
 
 > [!Note] 
-> ```latest``` tagged image is maybe a pre- or development-release. Please use always a release number (like ```3.11```) 
+> ```latest``` tagged image is maybe a pre- or development-release. Please use always a release number (like ```3.11dev2```) 
 
 ## Quickstart
 
@@ -119,7 +119,7 @@ You can use *Makefile* targets to build different images with different privacyI
 
 #### Build a specific privacyIDEA version
 ```
-make build PI_VERSION=3.11 PI_VERSION_BUILD=3.11
+make build PI_VERSION=3.11dev2 PI_VERSION_BUILD=3.11dev2
 ```
 
 #### Push to a registry
@@ -146,7 +146,7 @@ make distclean
 
 | target | optional ARGS | description | example
 ---------|----------|---|---------
-| ```build ``` | ```PI_VERSION```<br> ```IMAGE_NAME```|Build an image. Optional: specify the version, requirements version and image name| ```make build PI_VERSION=3.11 PI_VERSION_BUILD=3.11```|
+| ```build ``` | ```PI_VERSION```<br> ```IMAGE_NAME```|Build an image. Optional: specify the version, requirements version and image name| ```make build PI_VERSION=3.11dev2 PI_VERSION_BUILD=3.11dev2```|
 | ```push``` | ```REGISTRY```|Tag and push the image to the registry. Optional: specify the registry URI. Defaults to *localhost:5000*| ```make push REGISTRY=docker.io/gpappsoft/privacyidea-docker```|
 | ```run``` |  ```PORT``` <br> ```TAG```  |Run a standalone container with gunicorn and sqlite. Optional: specify the prefix tag of the container name and listen port. Defaults to *pi* and port *8080*| ```make run TAG=prod PORT=8888```|
 | ```secret``` | |Generate secrets to use in an environment file | ```make secret```|
@@ -270,7 +270,7 @@ You can start the stack in the background with console detached using the **-d**
 
 Full example including build with  ```make```targets:
 ```
-make cert build push stack PI_VERSION=3.11 PI_VERSION_BUILD=3.11 TAG=pidev
+make cert build push stack PI_VERSION=3.11dev2 PI_VERSION_BUILD=3.11dev2 TAG=pidev
 ```
 ---
 Now you can deploy additional containers like OpenLDAP for user realms or Owncloud as a client to test 2FA authentication. 

docker-compose.yaml

@@ -21,7 +21,7 @@ services:
       - openldap
 
   privacyidea:
-    image: gpappsoft/privacyidea-docker:${PI_VERSION}
+    image: privacyidea-docker:${PI_VERSION}
     deploy:
       restart_policy:
         condition: unless-stopped

environment/application-dev.env

@@ -1,7 +1,7 @@
 ENVIRONMENT="environment/application-dev.env"
 
 # PrivacyIDEA
-PI_VERSION=3.11
+PI_VERSION=3.11dev2
 PI_ADMIN=admin
 PI_ADMIN_PASS=admin
 PI_PORT=8080

environment/application-prod.env

@@ -1,7 +1,7 @@
 ENVIRONMENT="environment/application-prod.env"
 
 # PrivacyIDEA
-PI_VERSION=3.10.2
+PI_VERSION=3.11dev2
 PI_ADMIN=admin
 PI_ADMIN_PASS=admin
 PI_ADDRESS=0.0.0.0 

podman-run.sh

@@ -65,7 +65,7 @@ podman run --pod pi -dt --name=privacyidea \
     -e PI_PEPPER=/var/run/PI_PEPPER \
     -e DB_HOST="localhost" \
     -e DB_EXTRA_PARAMS="?charset=utf8" \
-    --restart=always gpappsoft/privacyidea-docker:3.11
+    --restart=always gpappsoft/privacyidea-docker:3.11dev2
 
 # start reverse_proxy
 podman run --pod pi -dt --name=reverse_proxy \