Commit Graph

66 Commits

Author SHA1 Message Date
Sameer Naik
c271cb48dd tests: make sed a little resilient to whitespaces 2015-11-28 10:06:22 +05:30
Sameer Naik
9198aa1ed5 Merge pull request #19 from sameersbn/tests-config-preserved
tests: Configuration changes are preserved after restart
2015-11-27 20:16:05 +05:30
Sameer Naik
7567ec54fa tests: Configuration changes are preserved after restart 2015-11-27 20:10:42 +05:30
Sameer Naik
a5e14ddaae Merge pull request #18 from sameersbn/update-test-helpers
update tests submodule
2015-11-25 11:55:41 +05:30
Sameer Naik
f47cf98e69 update tests submodule 2015-11-25 11:49:04 +05:30
Sameer Naik
218037f36e Merge pull request #17 from sameersbn/2.4.17-1-r02
bump version to 2.4.17-1-r02
2015-11-25 10:16:20 +05:30
Sameer Naik
e2d884ed57 bump version to 2.4.17-1-r02
- bumped to include the `cp || true` fix from `bitnami/base-ubuntu:14.04`
2015-11-25 10:10:09 +05:30
Sameer Naik
2149942152 Merge pull request #16 from sameersbn/2.4.17-1-r01
bump version 2.4.17-1-r01
2015-11-25 01:00:41 +05:30
Sameer Naik
5451fbf4b7 bump version 2.4.17-1-r01 2015-11-25 00:56:26 +05:30
Adnan Abdulhussein
c8e74aeda9 Merge pull request #15 from bitnami/2.4.17-1
Update to 2.4.17-1
2015-11-23 18:17:40 -08:00
Adnan Abdulhussein
39fa3ce82e Update to 2.4.17-1 2015-11-23 18:06:47 -08:00
Sameer Naik
7e509e8158 Merge pull request #14 from sameersbn/add-tests-submodule
tests: helpers have been moved to https://github.com/bitnami/bitnami-docker-tests.git
2015-11-10 11:09:37 +05:30
Sameer Naik
75df7c12b5 tests: helpers have been moved to https://github.com/bitnami/bitnami-docker-tests.git 2015-11-10 11:07:37 +05:30
Sameer Naik
280ece0447 Merge pull request #13 from sameersbn/rewrite-tests
tests: rewrite tests for better maintenance and readability
2015-11-09 21:15:37 +05:30
Sameer Naik
1ee0dbfdf5 tests: rewrite tests for better maintenance and readability
- Reuse docker_helper.bash script in tests
 - Speed up of tests
 - Better readability
2015-11-09 21:12:51 +05:30
Sameer Naik
ccc454be21 Merge pull request #12 from sameersbn/2.4.17-0
bump version 2.4.17-0
2015-10-15 00:01:22 +05:30
Sameer Naik
f58ec6bc0f bump version 2.4.17-0 2015-10-14 23:49:05 +05:30
Adnan Abdulhussein
5f762cb066 Merge pull request #11 from bitnami/fix-install-script-execution
Run install script as executable
2015-10-08 12:44:48 +01:00
Adnan Abdulhussein
23c5b9b16d Run install script as executable 2015-10-08 12:41:04 +01:00
Sameer Naik
1ed4cd28a6 Merge pull request #10 from sameersbn/2.4.12-4-r01
bump version 2.4.12-4-r01
2015-10-05 23:01:24 +05:30
Sameer Naik
de94161fc3 bump version 2.4.12-4-r01 2015-10-05 22:53:30 +05:30
Sameer Naik
cc5cadb5fd Merge pull request #9 from sameersbn/remove-app-volume-instruction
Remove app volume instruction
2015-10-05 22:12:58 +05:30
Sameer Naik
caf6501f1c chown the /app directory at boot 2015-10-05 22:07:30 +05:30
Sameer Naik
8fbe1b088e removed /app volume from dockerfile
Specifying a volume at `/app` (in the Dockerfile) makes it difficult to
use this image as a base image for derived images. Due to this, we have
removed the `VOLUME` instruction that mounts `/app` as a volume.

The `/app` path continues to function like it did before. As a resuly if
you want to mount your php application into the container, mount your
applucation source at `/app` using `-v
/path/on/application/source:/app`.

One advantage of mounting/installing your application at `/app` is that
the image will automatically update the ownership of the
files/directories in `/app` so that it is accessible by the `php-fpm`
process.
2015-10-05 22:06:30 +05:30
Sameer Naik
619d0889e3 Merge pull request #8 from sameersbn/base-image-updates
Base image updates
2015-10-04 14:16:13 +05:30
Sameer Naik
cff322167c use the entrypoint.sh script from the base image 2015-10-04 14:10:11 +05:30
Sameer Naik
78025ad8b8 the base image prints the welcome page by default 2015-10-04 14:09:38 +05:30
Adnan Abdulhussein
c6573f6167 Merge pull request #7 from sameersbn/s6-service
Configure Apache as an s6 service
2015-09-30 19:06:04 +01:00
Sameer Naik
3d3ad8fe62 tests: add --noproxy apache argument to curl 2015-09-30 21:39:03 +05:30
Sameer Naik
10b77e2c02 added circuit breaker logic for frequent and repeated failures 2015-09-30 21:37:44 +05:30
Sameer Naik
b6d6568e8d allow users to pass arguments to httpd 2015-09-30 21:31:29 +05:30
Sameer Naik
720912dab1 do not start apache if user specifies a command 2015-09-30 21:30:02 +05:30
Sameer Naik
228c72eea6 configure apache to start as a s6 service 2015-09-30 20:57:51 +05:30
Sameer Naik
c17e1d820d created rootfs/ directory structure 2015-09-30 20:51:31 +05:30
Sameer Naik
8fbf016685 fix installer.run.sha256 with busybox sha256sum applet 2015-09-15 15:12:25 +05:30
Sameer Naik
191221caa9 fix links to hub.docker.com 2015-08-08 12:00:10 +05:30
Adnan Abdulhussein
f676483bc9 Merge pull request #3 from bitnami/openssl-patch
Update to version with patched openssl
2015-07-10 13:31:25 -07:00
Adnan Abdulhussein
2663fb49b3 Update to version with patched openssl 2015-07-10 13:27:19 -07:00
Miguel Ángel Martínez Triviño
c1477e2695 Merge pull request #2 from bitnami/v-2.4.12-3
Apache v-2.4.12-3, event mode
2015-06-25 18:23:40 -07:00
Miguel Martinez
1ab37b5b68 Apache v-2.4.12-3, event mode 2015-06-25 18:20:44 -07:00
Miguel Martinez
d91e1da80b Adding badge 2015-06-19 18:06:13 -07:00
Miguel Martinez
6084cff4ea Adding vhosts to Apache 2015-06-19 17:58:00 -07:00
Miguel Ángel Martínez Triviño
8846b80958 Merge pull request #1 from bitnami/man_page_changes
Made minor copy edits
2015-06-19 17:20:35 -07:00
Mustafa Jamil
a99da51f2f Made minor copy edits 2015-06-19 17:05:26 -07:00
Adnan Abdulhussein
04df6c21fe Add testing section to README 2015-06-19 16:21:33 -07:00
Adnan Abdulhussein
67f417c503 Documentation changes
- link to project
  - use same volume paths in docker run and compose
  - always recommend backing up
2015-06-19 14:07:12 -07:00
Adnan Abdulhussein
848ab0398b Merge branch 'master' of github.com:Bitnami/bitnami-docker-apache 2015-06-19 11:46:19 -07:00
Adnan Abdulhussein
d717fb4d7e Add Apache 2.0 License 2015-06-19 11:46:07 -07:00
Miguel Martinez
6b0ab46fa5 Tests cleanup 2015-06-19 11:19:03 -07:00
Sameer Naik
43da3e475a Merge branch 'readme-updates' 2015-06-19 16:38:19 +05:30