Skip to content
Snippets Groups Projects
Commit 5127ff92 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Remise d'équerre de la conf Docker et de Composer

parent 80c3554a
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,6 @@ ENV APACHE_CONF_DIR=/etc/apache2 \ ...@@ -16,7 +16,6 @@ ENV APACHE_CONF_DIR=/etc/apache2 \
## Installation de packages requis. ## Installation de packages requis.
RUN apt-get update -y RUN apt-get update -y
RUN apt-get upgrade -y
RUN apt-get install -y unoconv RUN apt-get install -y unoconv
# Nettoyage # Nettoyage
......
...@@ -15,6 +15,7 @@ ENV APACHE_CONF_DIR=/etc/apache2 \ ...@@ -15,6 +15,7 @@ ENV APACHE_CONF_DIR=/etc/apache2 \
APPLICATION_ENV=test APPLICATION_ENV=test
## Installation de packages requis. ## Installation de packages requis.
RUN apt-get update -y
RUN apt-get install -y unoconv RUN apt-get install -y unoconv
# Nettoyage # Nettoyage
...@@ -30,6 +31,7 @@ RUN ln -sf /app/bin/ose /usr/local/bin/ose ...@@ -30,6 +31,7 @@ RUN ln -sf /app/bin/ose /usr/local/bin/ose
# Config PHP. # Config PHP.
ADD docker/${APPLICATION_ENV}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/app.ini ADD docker/${APPLICATION_ENV}/php.conf ${PHP_CONF_DIR}/fpm/conf.d/app.ini
ADD docker/${APPLICATION_ENV}/php.conf ${PHP_CONF_DIR}/cli/conf.d/app.ini
# Configuration Apache et FPM # Configuration Apache et FPM
ADD docker/${APPLICATION_ENV}/apache-ports.conf ${APACHE_CONF_DIR}/ports.conf ADD docker/${APPLICATION_ENV}/apache-ports.conf ${APACHE_CONF_DIR}/ports.conf
......
...@@ -1408,35 +1408,35 @@ ...@@ -1408,35 +1408,35 @@
}, },
{ {
"name": "ocramius/package-versions", "name": "ocramius/package-versions",
"version": "1.7.0", "version": "1.5.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Ocramius/PackageVersions.git", "url": "https://github.com/Ocramius/PackageVersions.git",
"reference": "651c372efc914aea8223e049f85afaf65e09ba23" "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/651c372efc914aea8223e049f85afaf65e09ba23", "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/1d32342b8c1eb27353c8887c366147b4c2da673c",
"reference": "651c372efc914aea8223e049f85afaf65e09ba23", "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer-plugin-api": "^1.1.0", "composer-plugin-api": "^1.0.0",
"php": "^7.4.0" "php": "^7.3.0"
}, },
"require-dev": { "require-dev": {
"composer/composer": "^1.9.3", "composer/composer": "^1.8.6",
"doctrine/coding-standard": "^7.0.2", "doctrine/coding-standard": "^6.0.0",
"ext-zip": "^1.15.0", "ext-zip": "*",
"infection/infection": "^0.15.3", "infection/infection": "^0.13.4",
"phpunit/phpunit": "^9.0.1", "phpunit/phpunit": "^8.2.5",
"vimeo/psalm": "^3.9.3" "vimeo/psalm": "^3.4.9"
}, },
"type": "composer-plugin", "type": "composer-plugin",
"extra": { "extra": {
"class": "PackageVersions\\Installer", "class": "PackageVersions\\Installer",
"branch-alias": { "branch-alias": {
"dev-master": "1.99.x-dev" "dev-master": "1.6.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -1455,7 +1455,7 @@ ...@@ -1455,7 +1455,7 @@
} }
], ],
"description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
"time": "2020-03-06T11:34:16+00:00" "time": "2019-07-17T15:49:50+00:00"
}, },
{ {
"name": "ocramius/proxy-manager", "name": "ocramius/proxy-manager",
......
...@@ -4,9 +4,8 @@ version: '3' ...@@ -4,9 +4,8 @@ version: '3'
# 172.21.0.10 ose-dev.localhost # 172.21.0.10 ose-dev.localhost
services: services:
ose-dev-test: ose-dev:
container_name: ose-dev container_name: ose-dev
image: ose-dev:php7.4
environment: environment:
XDEBUG_CONFIG: remote_host=172.17.0.1 XDEBUG_CONFIG: remote_host=172.17.0.1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment