Andrey/OCSInventory-Docker-Image
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
169 Commits 21 Branches 1 Tag 332 KiB
000e103e91
Commit Graph

169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wilton Rodrigues
d6a2d58b3c Adding IPDISCOVER_LINK_TAG_NETWORK missing config 
- This prevents the warning 'Bad setting. `IPDISCOVER_LINK_TAG_NETWORK` is not set.' on logs
 2021-10-30 11:58:02 -03:00
Wilton Rodrigues
769e4cc2fb Changing perl SOAP module 
- This prevents the error 'Can't load SOAP::Transport::HTTP* - Web service will be unavailable'
 2021-10-30 11:48:09 -03:00
Wilton Rodrigues
a1c948f57f Improving the Dockerfile 
- Configure Apache2 to output Logs to stdout and stderr
- Based on 5f92ab1814/2.4/Dockerfile (L202)
- Remove unecessary layers to WORKDIR and using directory params
 2021-10-30 11:34:46 -03:00
Wilton Rodrigues
5ed05a5946 Changing how container starts 
- Using best practices from https://docs.docker.com/develop/develop-images/dockerfile_best-practices/#entrypoint
- This way, the apache proccess will be PID 1
- It can simply start Apache2
- Or run Apache2 and pass parameters to the Server
 2021-10-30 11:16:18 -03:00
Wilton Rodrigues
28537752ce Minors Fixings 
- Removing wrong parameter for sed
- Using OCS_VERSION in docker-entrypoint.sh
 2021-10-29 14:59:17 -03:00
Wilton Rodrigues
90ae7d238a Replacing repetition of config files 2021-10-29 11:21:26 -03:00
Gilles Dubois
0acb4d800e
Merge pull request #67 from wiltonsr/add-some-improvements 
Add some improvements
 2021-10-28 18:03:21 +02:00
Gilles Dubois
87ac393dac
Merge pull request #66 from wiltonsr/dry-ocs-version 
Adding Don't repeat yourself (DRY) to OCS Version on Dockerfile
 2021-10-28 18:00:18 +02:00
Wilton Rodrigues
b0adeb01d5 Control if container will run Communication, WebServer or both 
- If OCS_DISABLE_COM_MODE environment variable is set, Communication server will be disabled
- If OCS_DISABLE_WEB_MODE environment variable is set, Administration server will be disabled
- Add Some logs to entrypoint.sh based on setup.sh
 2021-10-26 15:54:10 -03:00
Wilton Rodrigues
ab0da4cdb0 Add OCS_ options to /etc/httpd/conf.d/z-ocsinventory-server.conf 
- All environment variables starting with OCS_ and match valid options
will be added to Communication Server conf file
- Available valid options https://wiki.ocsinventory-ng.org/03.Basic-documentation/Setting-up-a-OCS-Inventory-Server/
 2021-10-26 13:41:39 -03:00
Wilton Rodrigues
152abe7d63 Adding Don't repeat yourself (DRY) to OCS Version on Dockerfile 2021-10-22 11:52:23 -03:00
Gilles Dubois
1ad8ae3f19
Merge pull request #62 from balmha/patch-1 
Update Dockerfile
 2021-08-23 08:22:19 +02:00
balmha
b329d1ebf0
Update Dockerfile 
add php73-php-ldap and php73-php-zip
 2021-07-19 16:38:41 -03:00