Commit Graph

103 Commits

Author SHA1 Message Date
jotadrilo b605883210 Merge pull request #40 from tompizmor/master
Update apache including OpenSSL security fixes
2016-09-24 20:44:30 +02:00
tompizmor 32bd9a8fd6 Merge pull request #1 from tompizmor/update-apache
Update apache including OpenSSL security fixes
2016-09-24 16:16:25 +02:00
tompizmor 41ba163021 Update Dockerfile 2016-09-24 16:16:06 +02:00
Adnan Abdulhussein 05c24855de Merge pull request #39 from sameersbn/baseimage-update
update to gcr.io/stacksmith-images/ubuntu:14.04-r10 baseimage
2016-09-23 14:02:36 -07:00
Sameer Naik b76c910b9c update to gcr.io/stacksmith-images/ubuntu:14.04-r10 baseimage 2016-09-23 23:30:56 +05:30
Jorge Marin 490fbf2f89 Merge pull request #37 from bitnami/bump_revision
Bump Apache revision with minor improvements
2016-09-21 10:22:43 +03:00
Jorge Marin 9be33ebc20 Bump Apache revision with minor improvements 2016-09-21 09:18:30 +02:00
Adnan Abdulhussein 299fb70f59 Merge pull request #36 from amrecio/update-apache-2.4.23-3
Update apache module to 2.4.23-3
2016-09-16 08:39:19 -07:00
Alvaro Manuel Recio fcb0cfe39f Update apache module to 2.4.23-3 2016-09-16 16:05:28 +02:00
Sameer Naik 7920341e6b Merge branch 'revision-2.4.23-r3' 2016-09-07 11:56:28 +05:30
Sameer Naik 6207f9c1c1 bump image version to 2.4.23-r3 2016-09-07 10:31:01 +05:30
Sameer Naik d4233b3c7a Merge branch 'harpoon-nami' 2016-09-07 10:29:20 +05:30
Sameer Naik f19c374ddf entrypoint: load the module inputs.json file 2016-09-03 13:19:14 +05:30
Sameer Naik 0d48288920 `harpoon` has been renamed to `nami` 2016-09-03 13:18:12 +05:30
Adnan Abdulhussein fba5280583 Merge pull request #33 from marcosbc/apache-2.4.23-2
Update Apache nami module to 2.4.23-2
2016-09-02 14:18:11 -07:00
Marcos Bjoerkelund 0b91125a83 Update Apache nami module to 2.4.23-2 2016-09-02 13:16:35 +02:00
Adnan Abdulhussein de0df27bcc Merge pull request #32 from bitnami/prydonius-patch-1
Add Docker Hub automated build badge
2016-08-26 17:32:50 -07:00
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