Merge pull request #193 from ProboCI/sprint/20210306-Sprint-6

Sprint/20210306 sprint 6

.eslintrc

@@ -1,3 +1,6 @@
 {
-  "extends": "./node_modules/eslint-config-probo/index.js"
+  "extends": "./node_modules/eslint-config-probo/index.js",
+  "parserOptions": {
+    "ecmaVersion": 2017
+  }
 }

CHANGELOG.md

@@ -1,7 +1,16 @@
 # Probo Changelog
 
+## 4.5.4
+- March 6, 2021
+- Added Docker file for microservice building down the road
+- NodeJS 12 update
+- Update dependent packages
+- Add in 18.04 PHP packages as approved
+- Added support for PHP 8.0
+
+
 ## 4.5.3
-- Feb 16 2020
+- Feb 16 2021
 - Set Drupal 8 as default Drupal version in Probo Drupal plugin. (https://github.com/ProboCI/probo/pull/179) 
 - Add support for Drupal 9 in the Probo Drupal plugin. (https://github.com/ProboCI/probo/pull/179)
 

Dockerfile

@@ -0,0 +1,16 @@
+# ProboCI
+# https://www.probo.ci
+
+FROM node:12.20.2
+
+RUN useradd --user-group --create-home --shell /bin/false probo
+RUN mkdir -p /home/probo/app
+COPY . /home/probo/app
+RUN chown -R probo:probo /home/probo/app
+
+USER probo
+RUN cd /home/probo/app/ && npm install
+
+WORKDIR /home/probo/app
+
+EXPOSE 3010 3012

README.md

@@ -1,6 +1,5 @@
 Probo
 ===========
-[![Build Status](https://travis-ci.org/ProboCI/probo.svg?branch=master)](https://travis-ci.org/ProboCI/probo) [![Coverage Status](https://coveralls.io/repos/ProboCI/probo/badge.svg?branch=master&service=github)](https://coveralls.io/github/ProboCI/probo?branch=master)
 
 [Probo.ci](http://probo.ci) is an open source continuous integration and quality assurance tool
 that lets you build branches and pull requests inside docker containers,

cli-subcommands/container-manager.js

@@ -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}`);
     });
   });

cli-subcommands/github-handler.js

@@ -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);
@@ -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) {

defaults.yaml

@@ -165,13 +165,29 @@ images:
         command: 'service varnish start'
       php_log:
         command: 'tail -F /var/log/php/error.log'
-  'proboci/ubuntu:18.04-php7.3':
+  'proboci/ubuntu:18.04-php5.6':
     services:
       cleanapache:
         command: 'rm /var/run/apache2/apache2.pid'
+      memcached:
+        command: memcached -u memcache
+      mysql:
+        command: 'mysqld_safe'
+      redis:
+        command: 'redis-server'
+      solr:
+        command: '/opt/solr/bin/solr start -f -force'
+      varnish:
+        command: 'service varnish start'
       apache:
         command: '/usr/sbin/apache2ctl -D FOREGROUND'
         port: 80
+      php_log:
+        command: 'tail -F /var/log/php/error.log'
+  'proboci/ubuntu:18.04-php7.0':
+    services:
+      cleanapache:
+        command: 'rm /var/run/apache2/apache2.pid'
       memcached:
         command: memcached -u memcache
       mysql:
@@ -182,15 +198,34 @@ images:
         command: '/opt/solr/bin/solr start -f -force'
       varnish:
         command: 'service varnish start'
+      apache:
+        command: '/usr/sbin/apache2ctl -D FOREGROUND'
+        port: 80
       php_log:
         command: 'tail -F /var/log/php/error.log'
-  'proboci/ubuntu:18.04-php7.4':
+  'proboci/ubuntu:18.04-php7.1':
     services:
       cleanapache:
         command: 'rm /var/run/apache2/apache2.pid'
+      memcached:
+        command: memcached -u memcache
+      mysql:
+        command: 'mysqld_safe'
+      redis:
+        command: 'redis-server'
+      solr:
+        command: '/opt/solr/bin/solr start -f -force'
+      varnish:
+        command: 'service varnish start'
       apache:
         command: '/usr/sbin/apache2ctl -D FOREGROUND'
         port: 80
+      php_log:
+        command: 'tail -F /var/log/php/error.log'
+  'proboci/ubuntu:18.04-php7.2':
+    services:
+      cleanapache:
+        command: 'rm /var/run/apache2/apache2.pid'
       memcached:
         command: memcached -u memcache
       mysql:
@@ -201,9 +236,12 @@ images:
         command: '/opt/solr/bin/solr start -f -force'
       varnish:
         command: 'service varnish start'
+      apache:
+        command: '/usr/sbin/apache2ctl -D FOREGROUND'
+        port: 80
       php_log:
         command: 'tail -F /var/log/php/error.log'
-  'mbagnall/ubuntu:18.04-php7.3':
+  'proboci/ubuntu:18.04-php7.3':
     services:
       cleanapache:
         command: 'rm /var/run/apache2/apache2.pid'
@@ -222,7 +260,7 @@ images:
         command: 'service varnish start'
       php_log:
         command: 'tail -F /var/log/php/error.log'
-  'mbagnall/ubuntu:18.04-php7.4':
+  'proboci/ubuntu:18.04-php7.4':
     services:
       cleanapache:
         command: 'rm /var/run/apache2/apache2.pid'
@@ -241,13 +279,10 @@ images:
         command: 'service varnish start'
       php_log:
         command: 'tail -F /var/log/php/error.log'
-  'mbagnall/ubuntu:18.04-php8.0':
+  'proboci/ubuntu:18.04-php8.0':
     services:
       cleanapache:
         command: 'rm /var/run/apache2/apache2.pid'
-      apache:
-        command: '/usr/sbin/apache2ctl -D FOREGROUND'
-        port: 80
       memcached:
         command: memcached -u memcache
       mysql:
@@ -258,6 +293,9 @@ images:
         command: '/opt/solr/bin/solr start -f -force'
       varnish:
         command: 'service varnish start'
+      apache:
+        command: '/usr/sbin/apache2ctl -D FOREGROUND'
+        port: 80
       php_log:
         command: 'tail -F /var/log/php/error.log'
 dataDir: './container-manager-data'
@@ -308,5 +346,3 @@ buildsEventStream:
 #     # for available options
 #     kafkaClientOptions:
 #       connectionString: 'localhost:2181'
-
-

lib/Container.js

@@ -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}`,
     ],
   };