Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
ba35a5b
Added coded to make it tie in to our Drupal Dashboard
ElusiveMind Aug 29, 2017
42d5b3c
Added the repo name
ElusiveMind Aug 29, 2017
239a80a
FIxed a syntactic error (javascript)
ElusiveMind Aug 29, 2017
b8e69e5
Fixed some missing ; issues
ElusiveMind Aug 29, 2017
6ac7060
FIxing issues with objects
ElusiveMind Aug 29, 2017
3701736
Finalized our string to the drupal module
ElusiveMind Aug 29, 2017
eb52992
Merge branch 'buildid-containerstop' into drupal-dashboard
ElusiveMind Aug 29, 2017
998ea77
Fixed a merge conflict
ElusiveMind Aug 29, 2017
ef43a50
Merge branch 'drupal-dashboard' of https://github.com/ElusiveMind/pro…
ElusiveMind Aug 29, 2017
5f294e8
Adding more tokens.
ElusiveMind Aug 31, 2017
fe2a957
Merge branch 'drupal-dashboard' of github.com:ElusiveMind/probo into …
ElusiveMind Aug 31, 2017
ac8f620
Updates to token handling including base64 handling of pull request l…
ElusiveMind Aug 31, 2017
2be6891
Add the service (bitbucket/github/whatever) to the list of tokens bei…
ElusiveMind Sep 1, 2017
a415fad
Adding in code to push status updates to an endpoint if configured.
ElusiveMind Sep 8, 2017
ba2b900
Add the endpointUrl to our config and remove the tokens from the link…
ElusiveMind Sep 8, 2017
8283a45
Add context and status to what we send to our endpoint
ElusiveMind Sep 11, 2017
74c6fe9
Added build object
ElusiveMind Sep 11, 2017
1af00e4
Limit our endpoint data to just status and build
ElusiveMind Sep 11, 2017
7c573a6
Removed syntactic error
ElusiveMind Sep 11, 2017
9ce3fd0
Merge branch 'buildid-containerstop' into drupal-dashboard
ElusiveMind Oct 6, 2017
a68bb1a
Sanitize databasePrefix and allow to be optional in configuration.
ElusiveMind Oct 7, 2017
d4b6280
Merge pull request #2 from ProboCI/fix/sk33lz/docker-image-commands
ElusiveMind Nov 20, 2017
19c875a
Merge branch 'master' into drupal-dashboard
ElusiveMind Nov 20, 2017
99333c9
Merge branch 'master' of github.com:ElusiveMind/probo
ElusiveMind Jan 7, 2018
919e4a4
Merge branch 'master' into drupal-dashboard
ElusiveMind Jan 7, 2018
0a1fbbb
Spelled out only the objects we want in our feed. Named them and sync…
ElusiveMind Jan 9, 2018
64830ce
FIxed a name issue
ElusiveMind Jan 9, 2018
d715162
Fix for URL for pull request
ElusiveMind Jan 9, 2018
a0984f6
Fix self link
ElusiveMind Jan 9, 2018
b024a77
Merge branch 'master' of https://github.com/ProboCI/probo
ElusiveMind Mar 11, 2018
19bd18c
Merge branch 'master' into drupal-dashboard
ElusiveMind Mar 11, 2018
50ea21f
Merge remote-tracking branch 'zivtech/master'
ElusiveMind Jun 13, 2018
d8197f6
Merge branch 'master' into drupal-dashboard
ElusiveMind Jun 13, 2018
9572bc1
Merge pull request #3 from ProboCI/master
ElusiveMind Oct 5, 2018
f9effb8
Merge branch 'master' into drupal-dashboard
ElusiveMind Oct 5, 2018
3acc0c5
Add in our baseURL directive
ElusiveMind Oct 21, 2018
c14cd3a
Fix syntax
ElusiveMind Oct 21, 2018
ef2abec
Remove the duplicate assignment parameter
ElusiveMind Oct 22, 2018
074376f
Add a database engine option for postgresql
ElusiveMind Oct 25, 2018
57ea75a
Some cleanup.
ElusiveMind Oct 25, 2018
163973d
Fix typo on variable name
ElusiveMind Oct 25, 2018
50967fc
Attempt to solve path
ElusiveMind Oct 27, 2018
7f63b0f
Remove
ElusiveMind Oct 27, 2018
f69c450
debugging our images
ElusiveMind Oct 27, 2018
7d49af0
Trying to trick startup
ElusiveMind Oct 27, 2018
75ef3d7
Problem is more fundamental than code
ElusiveMind Oct 27, 2018
6e80cdf
Our updates for $base_url and postgres.
ElusiveMind Oct 29, 2018
df77fbe
Merge branch 'postgres' into drupal-dashboard
ElusiveMind Nov 1, 2018
0adb1e8
Added the ability to bypass the timeout
ElusiveMind Nov 1, 2018
69922a3
Merge pull request #5 from ElusiveMind/drupal-dashboard2
ElusiveMind Nov 1, 2018
c2d9934
Add pull request data to debug the pull request URL issue
ElusiveMind Nov 7, 2018
fbf9007
Updates
ElusiveMind Nov 8, 2018
04ed3b9
Remove sending of full pull request data
ElusiveMind Nov 8, 2018
f47ce41
Add -y to our updb
ElusiveMind Nov 23, 2018
4eafa74
Update packages and tests to run in node version 8
kleinmp Dec 3, 2018
8fec577
More security updates
kleinmp Dec 6, 2018
d60f79f
removing security updates on dev modules
kleinmp Dec 6, 2018
d2aa507
Merge branch 'master' into feature/node-8
May 24, 2019
0ba1ce5
Run with node 12
gvso May 30, 2019
8bdf908
Update nock package
gvso May 30, 2019
eeac346
Update mocha and should packages
gvso May 31, 2019
eaf3795
Remove unused packages github-api and github-client
gvso May 31, 2019
c3e4619
Update github package
gvso Jun 3, 2019
a7ce005
Update restify package
gvso Jun 3, 2019
35f7983
Update yaml-config-loader package
gvso Jun 3, 2019
def5d80
Update minor packages
gvso Jun 3, 2019
e4a9d62
Update through2 and event-stream packages
gvso Jun 3, 2019
e5a3baa
Update async package
gvso Jun 3, 2019
1b89e5b
Update bluebird and superagent packages
gvso Jun 3, 2019
c1d4ff8
Update dev packages
gvso Jun 3, 2019
2d87f16
Add husky hooks
gvso Jun 3, 2019
ad4620f
Change GitHub authentication method
gvso Jun 6, 2019
e6d461f
Merge pull request #6 from ProboCI/master
ElusiveMind Jun 16, 2019
d161314
Merge branch 'master' into drupal-dashboard
ElusiveMind Jun 16, 2019
6c59652
Add support for GitLab
ElusiveMind Jun 16, 2019
2af7452
Updated for gitlab
ElusiveMind Jun 17, 2019
e42f0cb
Logging if recognized
ElusiveMind Jun 17, 2019
50183ff
Remove gitlab
ElusiveMind Jun 18, 2019
be4bdf1
Remove buggy check
ElusiveMind Jun 18, 2019
322a0b1
Fix the database name
ElusiveMind Jun 18, 2019
05de3d9
Code to run a unified PHP container where version is specified in yam…
ElusiveMind Jun 22, 2019
a745809
Fix logic surrounding valid PHP versions
ElusiveMind Jun 23, 2019
ed74d43
Add our restart
ElusiveMind Jun 23, 2019
7cd0056
Make the update command quiet trying to get bulds working
ElusiveMind Jun 23, 2019
f50078b
Try to reduce database errors
ElusiveMind Jun 23, 2019
f329bb7
Refinement of database creation process
ElusiveMind Jun 23, 2019
828c73a
Cleaner MySQL Setup
ElusiveMind Jun 23, 2019
aab6eac
Re-place the mysql stuff nd add an exit
ElusiveMind Jun 23, 2019
016cdcb
Remove hack
ElusiveMind Jun 23, 2019
22c9d6d
Use the existing Apache restart
ElusiveMind Jun 23, 2019
f58f6e1
Add the PHP Switcher for use with our PHP unified docker image
ElusiveMind Jun 24, 2019
d201cd5
Add our perl-module for handling cpan scripts
ElusiveMind Jun 24, 2019
208f21b
Merge branch 'perl-module' into elusivemind
ElusiveMind Jun 24, 2019
5e48201
Merge branch 'unified-php' into elusivemind
ElusiveMind Jun 24, 2019
931813e
Fix a conflict
ElusiveMind Jun 24, 2019
3764ebe
Fix issue without environment variable
ElusiveMind Jun 24, 2019
d9c7277
Fixed inclusion of Perl. Also check for packages in array format.
ElusiveMind Jun 24, 2019
860554b
Try to get the build php version
ElusiveMind Jun 25, 2019
d25ce06
Try to export the php version
ElusiveMind Jun 26, 2019
dd86794
Remove non-working assignment line for PHP version
ElusiveMind Jun 26, 2019
d237836
Define setBuildStatusAsync method
gvso Jun 27, 2019
98c2668
Include Drupal Task Runner
gvso Jun 27, 2019
007eacb
Fix coding standard violations
gvso Jun 27, 2019
7c71fca
Make setBuildStatusAsync asynchronous
gvso Jun 27, 2019
7a1d2fe
Merge branch 'PB-639/gitlab-server' into feature/node-12
gvso Jun 28, 2019
9f5ea52
Separate GitHubHandler into a server and a GitHub client
gvso Jul 2, 2019
b46cd1b
Update tests for the GitHub handler
gvso Jul 2, 2019
15c1043
Use nyc instead of istanbul
gvso Jul 2, 2019
8cc715d
Update handler for the get pull request path
gvso Jul 5, 2019
438ace1
Set logging level based on the configuration
gvso Jul 5, 2019
0b38cb2
Simplify Kafka Producer creation
gvso Jul 12, 2019
8d5cf1d
Use correct debug level
gvso Jul 18, 2019
7a66df9
Allow only removal of builds and remove containers in that endpoint
gvso Jul 18, 2019
62cfe26
Use kafka-node branch of probo-eventbus
gvso Jul 25, 2019
70843a1
Fix merge issues
gvso Aug 14, 2019
798bf74
[PB-651] - Update lodash
ElusiveMind Nov 3, 2019
96b1047
Merge branch 'PB-651' into elusivemind-pb-651
ElusiveMind Nov 3, 2019
7cae3a5
Merge branch 'feature/node-12' of git://github.com/ProboCI/probo into…
ElusiveMind Nov 5, 2019
b467f5b
Merge branch 'ProboCI-feature/node-12' into elusivemind-pr
ElusiveMind Nov 5, 2019
05e6718
Correct the case name of GitHubHandler.js
ElusiveMind Nov 6, 2019
0ae04ce
Merge pull request #9 from ProboCI/master
ElusiveMind Mar 7, 2020
7d4734e
Merge branch 'master' into postgres
ElusiveMind Mar 7, 2020
409f707
Merge branch 'elusivemind-pr' into postgres
ElusiveMind Mar 7, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"extends": "./node_modules/eslint-config-probo/index.js"
"extends": "./node_modules/eslint-config-probo/index.js",
"parserOptions": {
"ecmaVersion": 2017
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ out
.DS_Store
*.sw*
coverage
.DS_Store
2 changes: 1 addition & 1 deletion cli-subcommands/container-manager.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ exports.run = function(amour) {
throw error;
}
server.run(amour, function(error) {
logger.getLogger('container-manager')
logger.get('container-manager')
.info({config}, `Listening on ${config.port}`);
});
});
Expand Down
5 changes: 2 additions & 3 deletions cli-subcommands/github-handler.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict';

var GithubHandler = require('../lib/GithubHandler');
var GitHubHandler = require('../lib/GitHubHandler');

var exports = function() {
this.configure = this.configure.bind(this);
Expand Down Expand Up @@ -32,8 +32,7 @@ exports.options = function(yargs) {
};

exports.configure = function(config) {
config = config;
server = new GithubHandler(config);
server = new GitHubHandler(config);
};

exports.run = function(amour) {
Expand Down
17 changes: 17 additions & 0 deletions defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,23 @@ defaultImage: 'proboci/ubuntu-14.04-lamp:php-5.6'
image: 'proboci/ubuntu-14.04-lamp:php-5.6'
# The images used by the host manager
images:
'mbagnall/ubuntu-14.04:php7.1':
services:
cleanapache:
command: 'rm /var/run/apache2/apache2.pid'
apache:
command: '/usr/sbin/apache2ctl -D FOREGROUND'
port: 80
mysql:
command: 'mysqld_safe'
redis:
command: 'redis-server'
solr:
command: '/opt/solr/bin/solr start -f -force'
varnish:
command: 'service varnish start'
php_log:
command: 'tail -F /var/log/php/error.log'
'proboci/ubuntu-14.04-lamp:php-5.5':
services:
cleanapache:
Expand Down
2 changes: 1 addition & 1 deletion lib/Container.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ Container.prototype.create = Promise.promisify(function(done) {
`COMMIT_REF=${this.build.commit.ref}`,
`COMMIT_LINK=${this.build.commit.htmlUrl}`,
`PWD=${SRC_DIR}`,
`PROBO_ENVIRONMENT=TRUE`,
'PROBO_ENVIRONMENT=TRUE',
`SRC_DIR=${SRC_DIR}`,
],
};
Expand Down
Loading