issue-14: optimisation dockerfile
Cadoles/hydra-sql/pipeline/pr-develop There was a failure building this commit
Details
Cadoles/hydra-sql/pipeline/pr-develop There was a failure building this commit
Details
This commit is contained in:
parent
22231f791f
commit
a823ac7d0e
|
@ -1,3 +1,3 @@
|
|||
ARG ADDITIONAL_PACKAGES="bash mysql-client php81-cli php81-pdo_pgsql php81-pdo_mysql php81-mysqli php81-pgsql"
|
||||
ARG ADDITIONAL_PACKAGES="bash php81-cli php81-pdo_pgsql php81-pdo_mysql php81-mysqli php81-pgsql"
|
||||
|
||||
FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.1-standalone
|
|
@ -4,4 +4,23 @@
|
|||
// Utilisation du pipeline partagé pour les applications Symfony de Cadoles
|
||||
// Le nom de l'image Docker passée en paramètre vous permet de préciser l'environnement de test
|
||||
// de votre application Symfony
|
||||
symfonyAppPipeline("ubuntu:22.04")
|
||||
symfonyAppPipeline('ubuntu:22.04', [
|
||||
'hooks': [
|
||||
// Run docker image build, verification and publication stages
|
||||
'postSymfonyAppPipeline': {
|
||||
stage('Build and publish hydra-dispatcher image') {
|
||||
// Retrieve current tag
|
||||
String currentTag = sh(script: 'git tag --points-at HEAD | head -n 1', returnStdout: true).trim()
|
||||
// Retrieve default tag
|
||||
String defaultTag = sh(returnStdout: true, script: 'git describe --always').trim()
|
||||
container.buildAndPublishImage([
|
||||
'imageName': 'reg.cadoles.com/cadoles/hydra-dispatcher',
|
||||
// Use current tag or default tag if not defined
|
||||
'imageTag': defaultTag,
|
||||
'dockerfile': './misc/docker/Dockerfile',
|
||||
'dryRun': false
|
||||
])
|
||||
}
|
||||
}
|
||||
]
|
||||
])
|
|
@ -1,7 +1,6 @@
|
|||
version: "3.8"
|
||||
services:
|
||||
hydra-sql:
|
||||
container_name: hydra-sql
|
||||
hydra-sql:
|
||||
build:
|
||||
context: .
|
||||
dockerfile: Dockerfile.standalone
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
ARG ADDITIONAL_PACKAGES="bash mysql-client php81-cli php81-pdo_pgsql php81-pdo_mysql php81-mysqli php81-pgsql"
|
||||
ARG ADDITIONAL_PACKAGES="bash php81-cli php81-pdo_pgsql php81-pdo_mysql php81-mysqli php81-pgsql"
|
||||
|
||||
FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.1-standalone
|
||||
FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.1-base
|
|
@ -1,3 +1,3 @@
|
|||
ARG ADDITIONAL_PACKAGES="bash mysql-client php81-cli php81-pdo_pgsql php81-pdo_mysql php81-mysqli php81-pgsql"
|
||||
ARG ADDITIONAL_PACKAGES="bash php81-cli php81-pdo_pgsql php81-pdo_mysql php81-mysqli php81-pgsql"
|
||||
|
||||
FROM reg.cadoles.com/cadoles/symfony:alpine-php-8.1-standalone
|
|
@ -27,7 +27,6 @@ make down
|
|||
```
|
||||
DB_USER="lasql"
|
||||
DB_PASSWORD="lasql"
|
||||
|
||||
ISSUER_URL="http://localhost:8000"
|
||||
BASE_URL='http://localhost:8080'
|
||||
# connexion hydra
|
||||
|
@ -90,7 +89,7 @@ il faut aussi indique la sql_login.yaml à salt la valeur salt (qui correspond a
|
|||
|test3@test.com| 504ae1c3e2f5fdaf41f868164dabcef21e17059f5f388b452718a1ce92692c67| cesaltestunautreexemple| Dupont| Henri|
|
||||
|test4@test.com| $2a$12$91AHN7WFXieeadvUfZ88mO.9N7oS5adeXbdERnRno9oLAbqqDW4IG| NULL| Durand|Isabelle|
|
||||
|
||||
A noter que le hash de test4 est hashé avec l'algo bcrypt
|
||||
A noter que le hash de test4 est hashé avec l'algo bcrypt, il faut ajouter bcrypt dans la liste HASH_ALGO_LEGACY pour que l'identification soit possible
|
||||
```
|
||||
|
||||
### mariadb (sans salt)
|
||||
|
@ -127,4 +126,8 @@ sql_login:
|
|||
|`hydra-sql`|Login/Consent/Logout App (ce projet)|`8082`|
|
||||
|`postgres`| Base de donnée postgres support du test et pour hydra|`5432`
|
||||
|`mariadb`| Base de donnée mariadb support du test|`3306`
|
||||
|`pgadmin`| pour administrer la base de donnée |`8085`
|
||||
|`pgadmin`| pour administrer la base de donnée |`8085`
|
||||
|
||||
### Images
|
||||
|
||||
dépot Harbor:
|
Loading…
Reference in New Issue