Merge pull request #348 from sebadob/fix-ci-after-dx-improvements

Fix ci after dx improvements

.gitignore

@@ -14,4 +14,4 @@ static/v1
 templates/html/
 rauthy-book/book
 out/
-.test_pid
+.test_pid

README.md

@@ -154,7 +154,7 @@ Either just take a look at the [Rauthy Book](https://sebadob.github.io/rauthy/),
 the application yourself with docker on your localhost:
 
 ```
-docker run --rm -p 8080:8080 ghcr.io/sebadob/rauthy:0.22.0-lite
+docker run --rm -p 8080:8080 ghcr.io/sebadob/rauthy:0.22.1-lite
 ```
 
 ## Contributing

docs/getting_started/docker.html

@@ -181,7 +181,7 @@ <h2 id="testing--local-evaluation"><a class="header" href="#testing--local-evalu
 <pre><code>docker run --rm \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 </code></pre>
 <p>This will start the container in interactive mode with an in-memory SQLite database. Just take a look at the log at the
 logs to see the URL and first password.</p>
@@ -190,7 +190,7 @@ <h2 id="testing--local-evaluation"><a class="header" href="#testing--local-evalu
     -e DATABASE_URL=sqlite:data/rauthy.db \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 </code></pre>
 <div id="admonition-note" class="admonition admonish-note">
 <div class="admonition-title">
@@ -275,7 +275,7 @@ <h2 id="production-setup"><a class="header" href="#production-setup">Production
     -v $(pwd)/rauthy/data:/app/data \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 </code></pre>
 <p><strong>6. Restrict DB files access even more</strong><br />
 After rauthy has done the first start, you could harden the access rights of the SQLite files even more.<br />

docs/getting_started/k8s.html

@@ -320,7 +320,7 @@ <h3 id="create-and-apply-the-stateful-set"><a class="header" href="#create-and-a
         fsGroup: 10001
       containers:
         - name: rauthy
-          image: ghcr.io/sebadob/rauthy:0.22.0-lite
+          image: ghcr.io/sebadob/rauthy:0.22.1-lite
           imagePullPolicy: IfNotPresent
           securityContext:
             # User ID 10001 is actually built into the container at the creation for

docs/print.html

@@ -403,7 +403,7 @@ <h2 id="testing--local-evaluation"><a class="header" href="#testing--local-evalu
 <pre><code>docker run --rm \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 </code></pre>
 <p>This will start the container in interactive mode with an in-memory SQLite database. Just take a look at the log at the
 logs to see the URL and first password.</p>
@@ -412,7 +412,7 @@ <h2 id="testing--local-evaluation"><a class="header" href="#testing--local-evalu
     -e DATABASE_URL=sqlite:data/rauthy.db \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 </code></pre>
 <div id="admonition-note" class="admonition admonish-note">
 <div class="admonition-title">
@@ -497,7 +497,7 @@ <h2 id="production-setup"><a class="header" href="#production-setup">Production
     -v $(pwd)/rauthy/data:/app/data \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 </code></pre>
 <p><strong>6. Restrict DB files access even more</strong><br />
 After rauthy has done the first start, you could harden the access rights of the SQLite files even more.<br />
@@ -652,7 +652,7 @@ <h3 id="create-and-apply-the-stateful-set"><a class="header" href="#create-and-a
         fsGroup: 10001
       containers:
         - name: rauthy
-          image: ghcr.io/sebadob/rauthy:0.22.0-lite
+          image: ghcr.io/sebadob/rauthy:0.22.1-lite
           imagePullPolicy: IfNotPresent
           securityContext:
             # User ID 10001 is actually built into the container at the creation for

justfile

@@ -2,7 +2,7 @@ set shell := ["bash", "-uc"]
 
 export TAG := `cat Cargo.toml | grep '^version =' | cut -d " " -f3 | xargs`
 export DB_URL_SQLITE := `cat rauthy.cfg | grep ^DATABASE_URL= | cut -d'=' -f2`
-export DB_URL_POSTGRES := `cat rauthy.cfg | grep ^DATABASE_URL_POSTGRES= | cut -d'=' -f2`
+export DB_URL_POSTGRES := `cat .env | grep ^DATABASE_URL_POSTGRES= | cut -d'=' -f2`
 
 test_pid_file := ".test_pid"
 
@@ -324,12 +324,13 @@ build-postgres: test-postgres
 
     cargo clean
 
-    cargo clippy --features postgres -- -D warnings
-    cross build --release --target x86_64-unknown-linux-musl --features postgres
+    DATABASE_URL=$DB_URL_POSTGRES cargo clippy --features postgres -- -D warnings
+
+    CROSS_CONTAINER_OPTS="--env DATABASE_URL=$DB_URL_POSTGRES" cross build --release --target x86_64-unknown-linux-musl --features postgres
     cp target/x86_64-unknown-linux-musl/release/rauthy out/rauthy-postgres-amd64
 
     cargo clean
-    cross build --release --target aarch64-unknown-linux-musl --features postgres
+    CROSS_CONTAINER_OPTS="--env DATABASE_URL=$DB_URL_POSTGRES" cross build --release --target aarch64-unknown-linux-musl --features postgres
     cp target/aarch64-unknown-linux-musl/release/rauthy out/rauthy-postgres-arm64
 
 
@@ -399,6 +400,6 @@ publish-latest:
 verify: build-ui fmt test-full
     #!/usr/bin/env bash
     set -euxo pipefail
-    cargo clippy --features sqlite -- -D warnings
+    cargo clippy -- -D warnings
 
     echo "all good"

rauthy-book/src/getting_started/docker.md

@@ -9,7 +9,7 @@ The image contains a basic default config which is sufficient for local testing.
 docker run --rm \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 ```
 
 This will start the container in interactive mode with an in-memory SQLite database. Just take a look at the log at the
@@ -22,7 +22,7 @@ docker run -d \
     -e DATABASE_URL=sqlite:data/rauthy.db \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 ```
 
 ```admonish note
@@ -120,7 +120,7 @@ docker run -d \
     -v $(pwd)/rauthy/data:/app/data \
     -p 8080:8080 \
     --name rauthy \
-    ghcr.io/sebadob/rauthy:0.22.0-lite
+    ghcr.io/sebadob/rauthy:0.22.1-lite
 ```
 
 **6. Restrict DB files access even more**  

rauthy-book/src/getting_started/k8s.md

@@ -180,7 +180,7 @@ spec:
         fsGroup: 10001
       containers:
         - name: rauthy
-          image: ghcr.io/sebadob/rauthy:0.22.0-lite
+          image: ghcr.io/sebadob/rauthy:0.22.1-lite
           imagePullPolicy: IfNotPresent
           securityContext:
             # User ID 10001 is actually built into the container at the creation for

rauthy-main/tests/handler_auth.rs

@@ -13,7 +13,6 @@ use rauthy_common::constants::{
 use rauthy_common::error_response::{ErrorResponse, ErrorResponseType};
 use rauthy_common::utils::{base64_url_encode, base64_url_no_pad_encode, get_rand};
 use rauthy_models::entity::dpop_proof::{DPoPClaims, DPoPHeader};
-use rauthy_models::entity::groups::Group;
 use rauthy_models::entity::jwk::{JWKSPublicKey, JwkKeyPairAlg, JwkKeyPairType, JWKS};
 use rauthy_models::request::{
     LoginRequest, TokenRequest, TokenValidationRequest, UpdateClientRequest,

rauthy.cfg

@@ -244,7 +244,7 @@ CACHE_RECONNECT_TIMEOUT_UPPER=5000
 #
 #DATABASE_URL=sqlite::memory:
 DATABASE_URL=sqlite:data/rauthy.db
-DATABASE_URL_POSTGRES=postgresql://postgres:123SuperSafe@localhost:5432/rauthy
+DATABASE_URL_POSTGRES=postgresql://rauthy:123SuperSafe@localhost:5432/rauthy
 
 # Max DB connections - irrelevant for SQLite (default: 5)
 #DATABASE_MAX_CONN=5