Commit 5127ff92 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

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

parent 80c3554a

Dockerfile

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ ENV APACHE_CONF_DIR=/etc/apache2 \ 


## Installation de packages requis.

RUN apt-get update -y

RUN apt-get upgrade -y

RUN apt-get install -y unoconv



# Nettoyage

Dockerfile-test

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ ENV APACHE_CONF_DIR=/etc/apache2 \ 
    APPLICATION_ENV=test



## Installation de packages requis.

RUN apt-get update -y

RUN apt-get install -y unoconv



# Nettoyage
@@ -30,6 +31,7 @@ RUN ln -sf /app/bin/ose /usr/local/bin/ose 


# 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}/cli/conf.d/app.ini



# Configuration Apache et FPM

ADD docker/${APPLICATION_ENV}/apache-ports.conf    ${APACHE_CONF_DIR}/ports.conf

composer.lock

+14 −14
Original line number Diff line number Diff line
@@ -1408,35 +1408,35 @@ 
        },

        {

            "name": "ocramius/package-versions",

            "version": "1.7.0",

            "version": "1.5.1",

            "source": {

                "type": "git",

                "url": "https://github.com/Ocramius/PackageVersions.git",

                "reference": "651c372efc914aea8223e049f85afaf65e09ba23"

                "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/651c372efc914aea8223e049f85afaf65e09ba23",

                "reference": "651c372efc914aea8223e049f85afaf65e09ba23",

                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/1d32342b8c1eb27353c8887c366147b4c2da673c",

                "reference": "1d32342b8c1eb27353c8887c366147b4c2da673c",

                "shasum": ""

            },

            "require": {

                "composer-plugin-api": "^1.1.0",

                "php": "^7.4.0"

                "composer-plugin-api": "^1.0.0",

                "php": "^7.3.0"

            },

            "require-dev": {

                "composer/composer": "^1.9.3",

                "doctrine/coding-standard": "^7.0.2",

                "ext-zip": "^1.15.0",

                "infection/infection": "^0.15.3",

                "phpunit/phpunit": "^9.0.1",

                "vimeo/psalm": "^3.9.3"

                "composer/composer": "^1.8.6",

                "doctrine/coding-standard": "^6.0.0",

                "ext-zip": "*",

                "infection/infection": "^0.13.4",

                "phpunit/phpunit": "^8.2.5",

                "vimeo/psalm": "^3.4.9"

            },

            "type": "composer-plugin",

            "extra": {

                "class": "PackageVersions\\Installer",

                "branch-alias": {

                    "dev-master": "1.99.x-dev"

                    "dev-master": "1.6.x-dev"

                }

            },

            "autoload": {
@@ -1455,7 +1455,7 @@ 
                }

            ],

            "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",

docker-compose.yml

+1 −2
Original line number Diff line number Diff line
@@ -4,9 +4,8 @@ version: '3' 
# 172.21.0.10 ose-dev.localhost



services:

  ose-dev-test:

  ose-dev:

    container_name: ose-dev

    image: ose-dev:php7.4



    environment:

      XDEBUG_CONFIG: remote_host=172.17.0.1