Commit Graph

182 Commits

Author SHA1 Message Date
Lea9250
1cd4698c3e update latest 2023-10-04 11:29:23 +02:00
Charlene Auger
88a7710929 Add OCS version 2.12.1 2023-09-26 15:44:10 +02:00
Gilles Dubois
99287c72dd
Merge pull request #102 from OCSInventory-NG/update-2.12
Update 2.12
2023-07-12 14:25:59 +02:00
Charlene Auger
ed9a72c8a7 Update symbolic link 2023-07-12 14:15:35 +02:00
Charlene Auger
521ec4f17f Add 2.12 docker version 2023-07-12 14:15:25 +02:00
Gilles Dubois
655da1a5c5
Merge pull request #94 from OCSInventory-NG/docker_update
Docker update
2022-11-14 15:14:24 +01:00
Léa
2bf5ece0b1 add proxy_pass to nginx conf 2022-11-14 13:11:53 +00:00
Léa
c44eb4d253 update latest link to 2.11 2022-11-14 13:10:27 +00:00
Gilles Dubois
00306e60e2
Merge pull request #91 from OCSInventory-NG/updat2.11
Add 2.11
2022-10-17 11:27:46 +02:00
Charlene Auger
fd4888a6f6 Add 2.11 folder 2022-10-17 11:24:19 +02:00
Gilles Dubois
fe5effb3c6
Merge pull request #90 from OCSInventory-NG/update2.10
Add 2.10 and update dev and nightly with @wiltonsr modifications
2022-06-28 17:06:30 +02:00
Charlene Auger
441b26a8e6 Update nightly with @wiltonsr modifications 2022-06-28 14:26:45 +02:00
Charlene Auger
5cda3b80b6 Update dev to 2.10 and add @wiltonsr modifications 2022-06-28 14:26:01 +02:00
Charlene Auger
000e103e91 Add 2.10 server version 2022-06-28 10:04:49 +02:00
Charlène Auger
e4dc443b80
Merge pull request #86 from OCSInventory-NG/updatedevandnightly
Update dev and nightly with @wiltonsr contributions
2022-06-24 16:29:11 +02:00
Charlène Auger
7ee977e851
Merge pull request #87 from wiltonsr/refactoring-script-startup
Refactoring entrypoint scripts
2022-06-22 10:55:22 +02:00
Wilton Rodrigues
4d9bc72369 Refactoring entrypoint scripts
- Break large entrypoint script in small scripts
- Separates the responsibility of the contexts (api, communication and reports) in specific files
- Make it easy for users to add custom scripts across volumes in /docker-entrypoint.d directory
2022-05-03 14:52:16 -03:00
Charlène Auger
43b2f79bbd Update dev and nightly with @wiltonsr contributions 2022-05-03 14:39:04 +02:00
Charlène Auger
2b6013841c
Merge pull request #84 from wiltonsr/patch-3
Update Dockerfile
2022-05-03 14:34:10 +02:00
Charlène Auger
f9b975a3d1
Merge pull request #85 from wiltonsr/patch-5
Fix Apache Log Redirection
2022-05-03 14:34:01 +02:00
Wilton Rodrigues
4b4c27c8f2
Fix Apache Log Redirection
Adapt Apache's Logs redirection to work on Ubuntu base Image
2022-04-27 10:21:47 -03:00
Wilton Rodrigues
e5c34fa976
Update Dockerfile
Add missing lib php-ldap
2022-04-26 16:39:14 -03:00
Gilles Dubois
9407b4c2f3
Merge pull request #78 from OCSInventory-NG/update
Add 2.9.2 and update to ubuntu 20.04 + MySQL 8
2022-04-19 14:04:57 +02:00
Charlène Auger
3fcff42cd4 Update nightly 2022-04-19 11:38:23 +02:00
Charlène Auger
771d940567 Merge branch 'update' of https://github.com/OCSInventory-NG/OCSInventory-Docker-Image into update 2022-04-19 11:21:07 +02:00
Charlène Auger
62d0a66939 Update dev 2022-04-19 11:20:53 +02:00
Gilles Dubois
310b10675c Change syn link to 2.9.2 image 2022-04-15 17:41:38 +02:00
Charlène Auger
1e61e99ba5 Add nginx container 2022-04-13 17:39:17 +02:00
Charlène Auger
b28c17f21e Remove API ssl in ocsapplication container 2022-04-13 09:33:21 +02:00
Charlène Auger
255d7a5d39 Add API restrictions 2022-04-12 16:43:39 +02:00
Charlène Auger
44f23d6cff Fix API access 2022-04-12 15:12:56 +02:00
Charlène Auger
60d2add227 Remove CPAN call end XML::Entities and add API lib 2022-04-12 14:31:17 +02:00
Charlène Auger
071ea13ffe Fix typo 2022-01-12 09:56:34 +01:00
Charlène Auger
2f925f2c16 Add Switch lib 2022-01-12 09:56:25 +01:00
Charlène Auger
167c4ef252 Replace httpd by apache2 2022-01-12 09:45:19 +01:00
Charlène Auger
b9888f89cb Fix build 2022-01-11 15:23:52 +01:00
Charlène Auger
515107f1a7 Add 2.9.2 with ubuntu 2022-01-11 14:11:18 +01:00
Charlène Auger
0b60593438
Merge pull request #76 from OCSInventory-NG/nightlyImprovement
Standardize nightly with 2.9 docker file
2021-12-03 14:08:07 +01:00
Gilles Dubois
d953d5afa8 Standardize nightly with 2.9 docker file 2021-12-03 11:45:53 +01:00
Charlène Auger
497d6246dc
Merge pull request #74 from OCSInventory-NG/minorImprovments
Minor improvments
2021-12-02 17:32:35 +01:00
Gilles Dubois
9a070943c4 Fix replace mistake 2021-12-02 17:18:53 +01:00
Gilles Dubois
06b5c207b5 Use ocs version variable / fix typo 2021-12-02 17:12:08 +01:00
Gilles Dubois
4410cc9983 Remove broken links 2021-12-02 16:58:03 +01:00
Gilles Dubois
cac9a0d5d3 Add configurable API / Use variable avoid repetition 2021-12-02 16:56:36 +01:00
Gilles Dubois
94c9201764
Merge pull request #71 from wiltonsr/dockerfile-best-practices
Dockerfile best practices
2021-12-02 16:51:09 +01:00
Gilles Dubois
4e63073cc4
Merge branch 'master' into dockerfile-best-practices 2021-12-02 16:35:40 +01:00
Gilles Dubois
a12eb2d284
Merge pull request #70 from wiltonsr/minors-fixings
Minors fixings
2021-12-02 16:34:00 +01:00
Gilles Dubois
fea8eeec4c
Merge pull request #73 from cgregoirovh/dev/cgregoir/ISSUE-72
implemented api feature on docker image for latest version, nightly a…
2021-12-02 16:08:28 +01:00
Charly Gregoire
d1bec1d31d implemented api feature on docker image for latest version, nightly and dev 2021-11-08 16:30:00 +00:00
Wilton Rodrigues
a2140c7ab4 Setting Apache Server Name
- This prevents the warning 'Could not reliably determine the server's fully qualified domain name'
- Config Apache Server Name with APACHE_SERVER_NAME env var or
  'localhost'
2021-10-30 12:28:53 -03:00