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

180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Charlène Auger
677bf97883
Merge pull request #60 from OCSInventory-NG/fix29volumes 
Fix 2.9 volume mgmt
 2021-07-05 16:13:53 +02: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
Lea9250
ca02e0fa84
Merge pull request #55 from OCSInventory-NG/add-29 
Add 29
 2021-05-19 10:45:47 +02:00
Gilles Dubois
0170648359 Add ldap module in 2.9 image close #54 2021-05-19 10:41:02 +02:00
Gilles Dubois
a0e83cce70 Update symlink 2021-05-19 10:36:48 +02:00
Gilles Dubois
22bdb320b6 Add 2.9 version 2021-05-19 10:36:35 +02:00
Charlène Auger
65268e7580
Merge pull request #51 from OCSInventory-NG/add-281-version 
Add 281 version
 2020-12-15 16:16:50 +01:00
Gilles DUBOIS
a3cb44c6fe Update latest symlink 2020-12-15 14:37:56 +00:00
Gilles DUBOIS
b5eba01036 Add 2.8.1 version 2020-12-15 14:37:42 +00:00
Gilles DUBOIS
0efaa0b815 Execution permissions 2020-09-11 14:52:13 +00:00
Charlène Auger
3be8295146
Merge pull request #49 from OCSInventory-NG/2.8-release 
Remove 2.3.1 version / add 2.8
 2020-09-11 14:12:34 +02:00
Gilles Dubois
6e87843062 Remove 2.3.1 version / add 2.8 2020-09-11 11:48:33 +02:00
Gilles Dubois
8e78123b6d
Merge pull request #47 from OCSInventory-NG/minor-fix 
Minor fix
 2020-08-20 17:06:42 +02:00
Gilles Dubois
e7a1cad6f1 Update config with master 2020-08-20 16:48:47 +02:00
Gilles Dubois
60405d4ddd Remove bad symlink 2020-08-20 16:48:28 +02:00
Gilles Dubois
8437a3c585
Merge pull request #45 from OCSInventory-NG/fix-41 
Fix 41
 2020-08-19 13:59:59 +02:00
Gilles Dubois
da4cc9dd3c Rework 2.7 2020-08-19 12:25:03 +02:00
Gilles Dubois
3a428ac7bf Rework nightly 2020-08-19 12:24:55 +02:00
Gilles Dubois
2a41f678d9 Fix permissions on 2.7 image 2020-06-27 18:06:41 +02:00
Charlène Auger
f377df4cec
Merge pull request #34 from OCSInventory-NG/update-to-27 
Update to 27
 2020-03-20 10:32:03 +01:00
Gilles Dubois
04bdfbeacb Update docker compose and docker file tag 2020-03-17 17:48:58 +01:00
Gilles Dubois
c66316fae0 Add 2.7 version as docker image 2020-03-17 17:47:31 +01:00
Gilles Dubois
60cad7f1d6 Add 2.7 folder 2020-03-17 17:47:18 +01:00
Gilles Dubois
dfc4167d79
Merge pull request #33 from OCSInventory-NG/add-srv-port-mgmt 
Add srv port mgmt
 2020-03-17 17:36:24 +01:00
Gilles Dubois
38214119c1 Add SQL Port management for webconsole 2020-03-17 16:50:33 +01:00
Gilles Dubois
bb3fd09920 Add SQL Port management for webconsole 2020-03-17 16:50:26 +01:00
Charlène Auger
7779fcfe5f
Merge pull request #31 from OCSInventory-NG/nightly-dockerfile-update 
Remove *
 2020-03-09 10:53:52 +01:00
Gilles Dubois
f33993812c Remove * 2020-03-09 10:51:57 +01:00
Charlène Auger
9e4a8ecef7
Merge pull request #30 from OCSInventory-NG/Remove-2.3 
Remove now unsupported 2.3 verison
 2020-03-09 10:43:24 +01:00
Gilles Dubois
2a0848221c Remove now unsupported 2.3 verison 2020-03-09 08:55:31 +01:00
Charlène Auger
f924b69d26
Merge pull request #29 from OCSInventory-NG/no-remove-dev 
No tmp files removal
 2020-03-05 16:01:09 +01:00
Gilles Dubois
de24ee9964 No tmp files removal 2020-03-05 15:59:30 +01:00
Charlène Auger
311c31c470
Merge pull request #28 from OCSInventory-NG/fix-nightly 
Fix nightly
 2020-03-05 15:47:10 +01:00
Gilles Dubois
80705c67a6 Fix nightly 2020-03-05 15:44:28 +01:00
Gilles Dubois
d0b2dbefe0
Merge pull request #26 from alexandreChichmanian/master 
Fix issue #25 missing files at container restart
 2020-02-21 11:05:32 +01:00
alexandre
81fd20c8f5 Fix issue missing files at container restart 2020-02-19 18:25:50 -05:00
Gilles Dubois
1a227c3df7
Merge pull request #23 from OCSInventory-NG/rework 
Rework
 2020-01-08 16:13:22 +01:00
Gilles Dubois
b2ec9d2ef3 Update entry point 2020-01-08 15:09:36 +01:00