Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OSE
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
OSE
Commits
5127ff92
Commit
5127ff92
authored
Mar 23, 2020
by
Laurent Lecluse
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
Dockerfile
+0
-1
0 additions, 1 deletion
Dockerfile
Dockerfile-test
+2
-0
2 additions, 0 deletions
Dockerfile-test
composer.lock
+14
-14
14 additions, 14 deletions
composer.lock
docker-compose.yml
+1
-2
1 addition, 2 deletions
docker-compose.yml
with
17 additions
and
17 deletions
Dockerfile
+
0
−
1
View file @
5127ff92
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Dockerfile-test
+
2
−
0
View file @
5127ff92
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
composer.lock
+
14
−
14
View file @
5127ff92
...
@@ -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.1
5.3
",
"infection/infection": "^0.1
3.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": "20
20-03-06T11:34:16
+00:00"
"time": "20
19-07-17T15:49:50
+00:00"
},
},
{
{
"name": "ocramius/proxy-manager",
"name": "ocramius/proxy-manager",
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
2
View file @
5127ff92
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment