Commit Graph

135 Commits

Author SHA1 Message Date
Adnan Abdulhussein
7b057b4d80 Merge pull request #53 from javsalgar/patch-1
Update README.md with SSL Configuration
2016-11-14 10:49:47 -08:00
Javier J. Salmerón-García
ca9eb71288 Update README.md with SSL Configuration 2016-11-11 17:25:10 +01:00
Sameer Naik
3ae2525618 Merge pull request #50 from sameersbn/add-compose
adds docker-compose.yml
2016-11-08 16:48:48 +05:30
Sameer Naik
e82a390993 readme: updated docker-compose.yml snippets to v2 format 2016-11-08 15:04:12 +05:30
Francisco Ortiz
20ef5cfabb Merge pull request #52 from bitnami/fix_typo
Fix typo
2016-11-04 17:56:10 +01:00
Francisco Ortiz
ba5b0f29b8 Merge pull request #51 from bitnami/2.4
Bump Apache revision
2016-11-04 17:47:07 +01:00
Fran
ad9e71c5c9 Fix typo 2016-11-04 17:46:41 +01:00
Fran
5177c5eddd Bump Apache revision 2016-11-04 17:44:34 +01:00
Sameer Naik
a8d6ef1d16 adds docker-compose.yml 2016-11-04 19:36:49 +05:30
Sameer Naik
c5c62bf733 Merge pull request #49 from prydonius/update-stacksmith
ci: push update to stacksmith
2016-11-01 09:37:17 +05:30
Adnan Abdulhussein
0cb4552037 ci: push update to stacksmith 2016-10-31 20:56:15 -07:00
Francisco Ortiz
bcb480168d Merge pull request #48 from bitnami/2.4
Updated Apache revision
2016-10-27 15:53:42 +02:00
Fran
20b4ea7c55 Updated Apache revision 2016-10-27 15:46:55 +02:00
Sameer Naik
c4922ee95c Merge pull request #46 from sameersbn/ci-fixes
Ci fixes
2016-10-17 13:38:20 +05:30
Sameer Naik
738a98b700 ci: enforce stricter tagging rules 2016-10-17 13:24:21 +05:30
Sameer Naik
e853c12ea8 ci: quote variables in bash conditional statements 2016-10-17 13:24:21 +05:30
Sameer Naik
4dbcf7c83b Merge pull request #45 from prydonius/fix-circle-tag-regex
Fix CircleCI tag regex
2016-10-17 12:30:22 +05:30
Adnan Abdulhussein
53de9685a8 Set origin for GCR releases 2016-10-14 15:20:38 -07:00
Adnan Abdulhussein
02fb6d1bb5 Fix CircleCI tag regex 2016-10-14 11:30:07 -07:00
Sameer Naik
c7b4a7b957 Merge pull request #44 from sameersbn/ci-spec-update
Ci spec update
2016-10-14 10:57:06 +05:30
Sameer Naik
70d2f142f4 circle.yml: simplify deployment tag selection 2016-10-14 10:48:35 +05:30
Sameer Naik
90429c9d2d circle.yml: renamed cache build to _ 2016-10-14 10:48:34 +05:30
Sameer Naik
89ae94e4c4 Merge branch 'circleci-badge' 2016-10-13 22:40:42 +05:30
Sameer Naik
a83c9762dc add circle ci status badge to the readme 2016-10-13 22:40:42 +05:30
Sameer Naik
5735391223 Merge branch 'bats-eol' 2016-10-13 21:54:01 +05:30
Sameer Naik
30f79ff7b8 bats: end-of-life 2016-10-13 21:53:56 +05:30
Sameer Naik
9c9f642079 Merge pull request #43 from sameersbn/fix-script-macro
fix: BITNAMI_APP_VERSION script macro has been renamed to BITNAMI_IMA…
2016-10-13 20:35:42 +05:30
Sameer Naik
67062ef8cd fix: BITNAMI_APP_VERSION script macro has been renamed to BITNAMI_IMAGE_VERSION 2016-10-13 20:23:04 +05:30
Sameer Naik
0deba19e22 Merge pull request #41 from sameersbn/circleci-integration
uses CircleCI to build and deploy releases on DH
2016-10-13 12:10:24 +05:30
Sameer Naik
c746f27df9 replace development build with a cache build 2016-10-13 11:25:17 +05:30
Sameer Naik
0d4edadc01 circle-ci: correct GCLOUD_PROJECT 2016-10-12 22:48:40 +05:30
Sameer Naik
3482289b7e uses CircleCI to build and deploy releases on DH 2016-10-12 21:00:20 +05:30
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