Commit Graph

15 Commits

Author SHA1 Message Date
Laurent Destailleur
daca510fa6 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
	build/docker/docker-compose.yml
2022-01-23 18:52:47 +01:00
Cserveny, Tamás
adf7492575 migrate missing properties 2022-01-23 16:26:14 +01:00
Cserveny, Tamás
259c94e320 fix docker build setup 2022-01-20 17:57:21 +01:00
FVolral
c6e7881763 FIX: Docker-compose file and Dockerfile
Fix #18816 : During the build of the docker-compose `web` service, in
the `Dockerfile` There is a command which attemps to modify
`/etc/hosts`. On my system This file is Read-only. Using the
`extra_hosts` parameter in `docker-compose.yml` instead fix the
problem.
2021-09-24 19:49:30 +02:00
Florian HENRY
e4dfed53c2 new maildev work in docker compose 2020-10-27 22:42:48 +01:00
Florian HENRY
e9ff43ad44 ongoing 2020-09-01 14:31:54 +02:00
Florian HENRY
fba614632f working on docker image 2020-08-29 18:31:42 +02:00
Florian HENRY
b7f4162721 use new version docker file 2020-08-28 12:10:08 +02:00
Florian HENRY
08702a0d1a on going version 3 2020-08-26 14:16:49 +02:00
Birame SENE
e6a5d4c8d9 Add PNG/JPEG packages to build GD extension 2020-05-21 17:01:27 +02:00
Laurent Destailleur
b7b87929d0
Merge branch 'develop' into hotfix/docker-ziparchive 2020-01-10 00:08:27 +01:00
Laurent De Coninck
dc364af635
make the docker supports ZipArchive 2020-01-09 09:53:39 +01:00
Arunas Ruksnaitis
5572102ae5 Docker corrections 2019-12-10 00:30:47 +00:00
Laurent De Coninck
0f45ed0a8c fix docker image creation + xdebug
Fix the PHP image creation + adding xdebug

[see: X]
2018-11-30 13:04:06 +01:00
TuxGasy
d09ca6f3da Move all docker files into build/docker 2017-07-26 11:41:12 +02:00