Commit Graph

86 Commits

Author SHA1 Message Date
Adnan Abdulhussein
a86aa43bb4 Add Docker Hub automated build badge 2016-08-26 17:32:34 -07:00
Adnan Abdulhussein
0783eeced1 Merge pull request #31 from chipironcin/master
Bump revision to 2.4.23-1
2016-08-03 15:32:24 -07:00
Jorge Marin
ab8c5ea13a Bump revision to 2.4.23-1 2016-08-03 16:19:36 +02:00
Sameer Naik
ca85aa4fbd Merge pull request #30 from sameersbn/update-copyright-years
license: updated copyright years
2016-08-02 18:02:28 +05:30
Sameer Naik
21afab6406 license: updated copyright years 2016-08-02 15:42:42 +05:30
tompizmor
e49d0b2c8b Merge pull request #29 from bitnami/2.4
New Apache 2.4.23 version
2016-07-22 15:08:28 +02:00
Tomas
835ecdbd6d New Apache 2.4.23 version 2016-07-22 15:06:13 +02:00
Sameer Naik
832e1aae9c Merge pull request #28 from sameersbn/bump-version
Bump version
2016-07-12 10:52:16 +05:30
Sameer Naik
60e890cf24 bump version to 2.4.20-r1 2016-07-12 10:15:26 +05:30
Sameer Naik
0a25166bc9 update to gcr.io/stacksmith-images/ubuntu:14.04-r8 2016-07-12 10:15:04 +05:30
Sameer Naik
a8f87c22d4 Stacksmith merger (#27)
* switch to harpoon installer

* bump version to 2.4.18-0

* removed unused `installer.run.sha256`

* added sha256 hash for package verification

* switch to `gcr.io/stacksmith-images/ubuntu:14.04` base image

* removed `logs/` and `conf/` VOLUME mountpoints

* removed unused files

* display bitnami welcome text

* check for updates on container startup

* upgrade baseimage: gcr.io/stacksmith-images/ubuntu:14.04-r05

* removed sample vhost configurations

* updated to latest apache-2.4.18-0 package (#3)

* organize dockerfile for stacksmith (#4)

* removed `BITNAMI_APP_DIR` macro

* removed `VOLUME` instruction

* removed `BITNAMI_APP_VOL_PREFIX` macro

* add `/opt/bitnami/$BITNAMI_APP_NAME/sbin` to PATH

* organize dockerfile for stacksmith

* add `/opt/bitnami/common/bin` to `PATH`

* readme: updated (#5)

* upgrade to `gcr.io/stacksmith-images/ubuntu:14.04-r07` and `apache-2.4.18-2`

* create `/app` symlink to `/opt/bitnami/$BITNAMI_APP_NAME/htdocs`

* readme: updates

* tests: bump SLEEP_TIME

* tests: make vhosts test compatible with `sh` shell

* readme: updates

* upgrade to `apache-2.4.20-0`

* updated .gitignore rules

* updated .dockerignore rules

* app-entrypoint: fix `chown` operation
2016-05-27 16:53:55 -07:00
Sameer Naik
2793591883 Merge branch 'luislobo-master' 2016-05-26 12:04:56 +05:30
Luis Lobo Borobia
3ea0b83d20 Removed changing the user when chowning source files
This allows for the user to still have ownership when developing
2016-05-20 21:24:10 -03:00
Adnan Abdulhussein
ac026b5bed Merge pull request #24 from bitnami/2.4.18-0
OpenSSL security release - bump version 2.4.18-0
2016-03-03 10:11:33 -08:00
Bitnami Container Builds
b87d34c5b4 bump version 2.4.18-0 2016-03-02 22:48:19 +01:00
Sameer Naik
cc99f4edd0 Merge pull request #23 from sameersbn/bump-2.4.17-1-r03
bump version to 2.4.17-1-r03
2016-02-17 11:16:42 -08:00
Sameer Naik
f7daeb475e bump version to 2.4.17-1-r03 2016-02-17 11:03:15 -08:00
Sameer Naik
3fde191ed7 Merge pull request #22 from sameersbn/fix-vhosts-templates
fixed installation of example vhost configurations
2016-01-27 00:03:14 +05:30
Sameer Naik
cd32c29679 fixed installation of example vhost configurations 2016-01-26 23:57:56 +05:30
Sameer Naik
e765d6c300 Merge pull request #20 from sameersbn/sed-whitespace
tests: make `sed` a little resilient to whitespaces
2015-11-28 10:13:11 +05:30
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