Compare commits
3 Commits
202212.26.
...
b10074e440
Author | SHA1 | Date | |
---|---|---|---|
b10074e440
|
|||
d8792adc5f
|
|||
0ba659e17f
|
@@ -33,6 +33,8 @@ steps:
|
||||
commands:
|
||||
- composer install --no-scripts --no-interaction
|
||||
- composer update --with-all-dependencies --no-interaction chill-project/chill-bundles
|
||||
depends_on:
|
||||
- build-base-image
|
||||
|
||||
- name: build-assets
|
||||
image: node:14
|
||||
@@ -40,6 +42,8 @@ steps:
|
||||
commands:
|
||||
- yarn install
|
||||
- yarn run encore production
|
||||
depends_on:
|
||||
- composer-install
|
||||
|
||||
- name: build-image-php
|
||||
image: plugins/docker
|
||||
@@ -56,6 +60,9 @@ steps:
|
||||
cache_from:
|
||||
- h3m6q87t.gra7.container-registry.ovh.net/chillbasics/php-base:latest
|
||||
- chill/base-image:latest
|
||||
depends_on:
|
||||
- build-assets
|
||||
- composer-install
|
||||
|
||||
- name: build-image-nginx
|
||||
image: plugins/docker
|
||||
@@ -70,3 +77,5 @@ steps:
|
||||
tag:
|
||||
- ${DRONE_TAG}
|
||||
Dockerfile: docker/nginx/Dockerfile
|
||||
depends_on:
|
||||
- build-assets
|
||||
|
@@ -15,7 +15,7 @@
|
||||
},
|
||||
"require": {
|
||||
"ext-redis": "*",
|
||||
"chill-project/chill-bundles": "dev-master#351df930a1274ee4f308b7f898f2d7485c9659f3",
|
||||
"chill-project/chill-bundles": "dev-master#bbd2599e7e6040c7090bfb11bc2f913b5a73d5e4",
|
||||
"symfony/flex": "^1.9",
|
||||
"symfony/http-client": "^4.4 || ^5",
|
||||
"nelmio/alice": "^3.8",
|
||||
|
8
composer.lock
generated
8
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "b80cc48fce9bd7e64756d3c5431279ae",
|
||||
"content-hash": "579aaf96d9d506c029dc6d995514e006",
|
||||
"packages": [
|
||||
{
|
||||
"name": "brick/math",
|
||||
@@ -228,12 +228,12 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "git@gitlab.com:Chill-Projet/chill-bundles.git",
|
||||
"reference": "351df930a1274ee4f308b7f898f2d7485c9659f3"
|
||||
"reference": "bbd2599e7e6040c7090bfb11bc2f913b5a73d5e4"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=351df930a1274ee4f308b7f898f2d7485c9659f3",
|
||||
"reference": "351df930a1274ee4f308b7f898f2d7485c9659f3",
|
||||
"url": "https://gitlab.com/api/v4/projects/Chill-Projet%2Fchill-bundles/repository/archive.zip?sha=bbd2599e7e6040c7090bfb11bc2f913b5a73d5e4",
|
||||
"reference": "bbd2599e7e6040c7090bfb11bc2f913b5a73d5e4",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
@@ -24,7 +24,7 @@ chill_main:
|
||||
default_country: '%env(string:ADD_ADDRESS_DEFAULT_COUNTRY)%'
|
||||
map_center:
|
||||
x: '%env(float:ADD_ADDRESS_MAP_CENTER_X)%'
|
||||
y: '%env(float:ADD_ADDRESS_MAP_CENTER_y)%'
|
||||
y: '%env(float:ADD_ADDRESS_MAP_CENTER_Y)%'
|
||||
z: '%env(float:ADD_ADDRESS_MAP_CENTER_Z)%'
|
||||
|
||||
chill_custom_fields:
|
||||
|
Reference in New Issue
Block a user