Commit Graph

22 Commits

Author SHA1 Message Date
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
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
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
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
7a3e7e91af Fix 2.9 volume mgmt 2021-06-29 16:33:22 +02:00
Gilles Dubois
3c6b0bef87
Add zip dep on 2.9 tag 2021-06-08 14:44:45 +02:00
Gilles Dubois
0170648359 Add ldap module in 2.9 image close #54 2021-05-19 10:41:02 +02:00
Gilles Dubois
22bdb320b6 Add 2.9 version 2021-05-19 10:36:35 +02:00