Merge pull request #40 from ProboCI/feature/docker

Feature/docker
ProboCI · Sep 9, 2021 · cc75f9a · cc75f9a
2 parents 00f6ea1 + 54086a3
commit cc75f9a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 3,047 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,18 @@
+# ProboCI
+# https://www.probo.ci
+
+FROM node:12
+
+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 3038
+
+CMD ["sh", "/home/probo/app/bin/startup.sh"]
diff --git a/bin/probo-reaper b/bin/probo-reaper
@@ -23,7 +23,7 @@ function cliProcessing(argv, done) {
     yargs.showHelp();
   }
 
-  loader.add(path.resolve(path.join(__dirname, '..', 'defaults.yaml')), {allowedKeys: true});
+  loader.add(path.resolve(path.join(__dirname, '..', 'defaults.yaml')), { allowedKeys: true });
   if (argv.config) {
     argv.config = Array.isArray(argv.config) ? argv.config : [argv.config];
     argv.config.forEach(function(file) {

diff --git a/bin/startup.sh b/bin/startup.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec /home/probo/app/bin/probo-reaper server -c /etc/probo/reaper.yaml
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "probo-reaper",
-  "version": "4.3.0",
+  "version": "5.0.0",
   "description": "Cleans up old Probo containers and ensures that only the allocated number of containers exist.",
   "main": "index.js",
   "bin": {
@@ -42,7 +42,7 @@
     "request": "^2.72.0",
     "request-promise": "^4.2.4",
     "through2": "^3.0.1",
-    "yaml-config-loader": "^2.0.1",
+    "yaml-config-loader": "^2.1.0",
     "yargs": "^3.30.0"
   },
   "devDependencies": {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		exec /home/probo/app/bin/probo-reaper server -c /etc/probo/reaper.yaml