Compare commits
8 commits
86558dc76d
...
22ec3d036e
Author | SHA1 | Date | |
---|---|---|---|
Simon Vieille | 22ec3d036e | ||
Simon Vieille | 676e9dfe67 | ||
Simon Vieille | 508a816642 | ||
Simon Vieille | 476dece659 | ||
Simon Vieille | 1a7ea2e5a2 | ||
Simon Vieille | 6fa3aafed0 | ||
Simon Vieille | 1041eba4cb | ||
Simon Vieille | 698c356c0e |
|
@ -18,7 +18,7 @@ magephp:
|
|||
- "/var/cache/*"
|
||||
- "/var/log/*"
|
||||
- "/public/media"
|
||||
- "/.secrets"
|
||||
- "/.secrets"
|
||||
hosts:
|
||||
- ssh_host
|
||||
on-deploy:
|
||||
|
|
|
@ -8,50 +8,44 @@ when:
|
|||
branch: [master, master-*, develop, develop-*, feature/*]
|
||||
|
||||
steps:
|
||||
db-wait:
|
||||
"Wait the database":
|
||||
image: gitnet.fr/deblan/timeout:latest
|
||||
commands:
|
||||
- /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 2>&1 | grep succeeded && exit 0; sleep 0.5; done'
|
||||
|
||||
secrets:
|
||||
image: gitnet.fr/deblan/novops
|
||||
secrets: [vault_addr, vault_token]
|
||||
commands:
|
||||
- novops load -e build > .secrets
|
||||
|
||||
db-create:
|
||||
"Create database":
|
||||
image: mariadb:10.3
|
||||
secrets: [mysqldump]
|
||||
commands:
|
||||
- . ./.secrets
|
||||
- mysql -hdb -uroot -proot -e "CREATE DATABASE app"
|
||||
- eval "$MYSQLDUMP" | mysql -hdb -uroot -proot app
|
||||
|
||||
app-config:
|
||||
"Configure app":
|
||||
image: deblan/php:8.1
|
||||
commands:
|
||||
- echo APP_ENV=prod >> .env.local
|
||||
- echo APP_SECRET=$(openssl rand -hex 32) >> .env.local
|
||||
- echo DATABASE_URL=mysql://root:root@db/app >> .env.local
|
||||
|
||||
php-composer:
|
||||
"Installs PHP dependencies":
|
||||
image: deblan/php:8.1
|
||||
commands:
|
||||
- apt-get update && apt-get -y install git
|
||||
- composer install --no-scripts
|
||||
|
||||
db-migrate:
|
||||
"Migrates database":
|
||||
image: deblan/php:8.1
|
||||
environment:
|
||||
- PHP=php
|
||||
commands:
|
||||
- ./bin/doctrine-migrate
|
||||
|
||||
app-jsroutes:
|
||||
"Generates JS routes":
|
||||
image: deblan/php:8.1
|
||||
commands:
|
||||
- php bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json
|
||||
|
||||
node-build:
|
||||
"Build assets":
|
||||
image: node:16-alpine
|
||||
environment:
|
||||
- CPU_COUNT=3
|
||||
|
@ -66,13 +60,13 @@ steps:
|
|||
- test -f public/js/fos_js_routes.json || echo "{}" > public/js/fos_js_routes.json
|
||||
- npm run build
|
||||
|
||||
security-check:
|
||||
"Check dependencies":
|
||||
image: gitnet.fr/deblan/osv-detector:v0.9
|
||||
commands:
|
||||
- osv-detector composer.lock yarn.lock
|
||||
failure: ignore
|
||||
|
||||
cache-build:
|
||||
"Build the cache":
|
||||
image: deblan/mage
|
||||
volumes: *volumes
|
||||
commands:
|
||||
|
|
|
@ -8,17 +8,11 @@ when:
|
|||
skip_clone: true
|
||||
|
||||
steps:
|
||||
secrets:
|
||||
image: gitnet.fr/deblan/novops
|
||||
secrets: [vault_addr, vault_token]
|
||||
commands:
|
||||
- novops load -e deploy > .secrets
|
||||
|
||||
app-deploy:
|
||||
"Deploy":
|
||||
image: deblan/mage
|
||||
secrets: [ssh_priv_key, ssh_user, ssh_host, app_directory]
|
||||
volumes: *volumes
|
||||
commands:
|
||||
- . ./.secrets
|
||||
- cd "/builds/$CI_COMMIT_SHA"
|
||||
- mkdir "$HOME/.ssh"
|
||||
- echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
|
||||
|
|
|
@ -2,56 +2,60 @@
|
|||
@import "~simplemde/dist/simplemde.min.css";
|
||||
|
||||
.CodeMirror-fullscreen, .editor-toolbar.fullscreen {
|
||||
z-index: 2000;
|
||||
z-index: 2000;
|
||||
}
|
||||
|
||||
.ejs-link {
|
||||
margin: 10px auto;
|
||||
max-width: 80%;
|
||||
border: 2px solid #333;
|
||||
border-radius: 5px;
|
||||
margin: 10px auto;
|
||||
max-width: 80%;
|
||||
border: 2px solid #333;
|
||||
border-radius: 5px;
|
||||
|
||||
&--anchor {
|
||||
display: block;
|
||||
padding: 30px;
|
||||
&--anchor {
|
||||
display: block;
|
||||
padding: 30px;
|
||||
}
|
||||
|
||||
&-content {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
|
||||
&--title {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
&-content {
|
||||
display: inline-block;
|
||||
vertical-align: top;
|
||||
|
||||
&--title {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
&--description {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
&--link {
|
||||
padding-top: 10px;
|
||||
font-size: 14px;
|
||||
line-height: 20px;
|
||||
}
|
||||
&--description {
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
$image-size: 85px;
|
||||
|
||||
&--anchor--with-image &-content {
|
||||
width: calc(100% - $image-size - 5px);
|
||||
padding-right: 25px;
|
||||
&--link {
|
||||
padding-top: 10px;
|
||||
font-size: 14px;
|
||||
line-height: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
&--image {
|
||||
display: inline-block;
|
||||
width: $image-size;
|
||||
height: $image-size;
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
}
|
||||
$image-size: 85px;
|
||||
|
||||
&--anchor--with-image &-content {
|
||||
width: calc(100% - $image-size - 5px);
|
||||
padding-right: 25px;
|
||||
}
|
||||
|
||||
&--image {
|
||||
display: inline-block;
|
||||
width: $image-size;
|
||||
height: $image-size;
|
||||
background-position: center center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: cover;
|
||||
}
|
||||
}
|
||||
|
||||
.choices__list--dropdown {
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
.editor-toolbar, .CodeMirror {
|
||||
border-color: $input-border-color;
|
||||
}
|
||||
|
|
|
@ -411,6 +411,9 @@ pre[class*="language-"] {
|
|||
.h1 {
|
||||
font-weight: normal;
|
||||
font-size: 40px;
|
||||
font-family: Verdana;
|
||||
text-shadow: none;
|
||||
color: hsla(0, 0%, 100%, 0.7);
|
||||
}
|
||||
|
||||
.h3 {
|
||||
|
|
36
yarn.lock
36
yarn.lock
|
@ -3028,7 +3028,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
|
|||
dependencies:
|
||||
ms "2.1.2"
|
||||
|
||||
debuglog@*, debuglog@^1.0.1:
|
||||
debuglog@^1.0.1:
|
||||
version "1.0.1"
|
||||
resolved "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz"
|
||||
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
|
||||
|
@ -4851,7 +4851,7 @@ import-local@^3.0.2:
|
|||
pkg-dir "^4.2.0"
|
||||
resolve-cwd "^3.0.0"
|
||||
|
||||
imurmurhash@*, imurmurhash@^0.1.4:
|
||||
imurmurhash@^0.1.4:
|
||||
version "0.1.4"
|
||||
resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
|
||||
integrity "sha1-khi5srkoojixPcT7a21XbyMUU+o= sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="
|
||||
|
@ -5631,11 +5631,6 @@ lodash-node@~2.4.0, lodash-node@~2.4.1:
|
|||
resolved "https://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz"
|
||||
integrity sha512-egEt8eNQp2kZWRmngahiqMoDCDCENv3uM188S7Ed5t4k3v6RrLELXC+FqLNMUnhCo7gvQX3G1V8opK/Lcslahg==
|
||||
|
||||
lodash._baseindexof@*:
|
||||
version "3.1.0"
|
||||
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
|
||||
integrity sha512-bSYo8Pc/f0qAkr8fPJydpJjtrHiSynYfYBjtANIgXv5xEf1WlTC63dIDlgu0s9dmTvzRu1+JJTxcIAHe+sH0FQ==
|
||||
|
||||
lodash._baseuniq@~4.6.0:
|
||||
version "4.6.0"
|
||||
resolved "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"
|
||||
|
@ -5644,33 +5639,11 @@ lodash._baseuniq@~4.6.0:
|
|||
lodash._createset "~4.0.0"
|
||||
lodash._root "~3.0.0"
|
||||
|
||||
lodash._bindcallback@*:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
|
||||
integrity sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==
|
||||
|
||||
lodash._cacheindexof@*:
|
||||
version "3.0.2"
|
||||
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
|
||||
integrity sha512-S8dUjWr7SUT/X6TBIQ/OYoCHo1Stu1ZRy6uMUSKqzFnZp5G5RyQizSm6kvxD2Ewyy6AVfMg4AToeZzKfF99T5w==
|
||||
|
||||
lodash._createcache@*:
|
||||
version "3.1.2"
|
||||
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
|
||||
integrity sha512-ev5SP+iFpZOugyab/DEUQxUeZP5qyciVTlgQ1f4Vlw7VUcCD8fVnyIqVUEIaoFH9zjAqdgi69KiofzvVmda/ZQ==
|
||||
dependencies:
|
||||
lodash._getnative "^3.0.0"
|
||||
|
||||
lodash._createset@~4.0.0:
|
||||
version "4.0.3"
|
||||
resolved "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"
|
||||
integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=
|
||||
|
||||
lodash._getnative@*, lodash._getnative@^3.0.0:
|
||||
version "3.9.1"
|
||||
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
|
||||
integrity sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==
|
||||
|
||||
lodash._root@~3.0.0:
|
||||
version "3.0.1"
|
||||
resolved "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
|
||||
|
@ -5761,11 +5734,6 @@ lodash.reject@^4.4.0:
|
|||
resolved "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz"
|
||||
integrity "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU= sha512-qkTuvgEzYdyhiJBx42YPzPo71R1aEr0z79kAv7Ixg8wPFEjgRgJdUsGMG3Hf3OYSF/kHI79XhNlt+5Ar6OzwxQ=="
|
||||
|
||||
lodash.restparam@*:
|
||||
version "3.6.1"
|
||||
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
|
||||
integrity sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==
|
||||
|
||||
lodash.some@^4.4.0:
|
||||
version "4.6.0"
|
||||
resolved "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz"
|
||||
|
|
Loading…
Reference in a new issue