Merge pull request #5 from secureCodeBox/feature/docker-health

Feature/docker health

Dockerfile

@@ -1,13 +1,15 @@
 FROM ruby:alpine
 
-RUN apk update && apk upgrade && apk add perl perl-net-ssleay make g++ openssl
+RUN apk update && apk upgrade && apk add perl perl-net-ssleay make g++ openssl curl
 
 WORKDIR /sectools/
 
 RUN wget https://github.com/sullo/nikto/archive/master.tar.gz -P /sectools && \
     tar zxvf /sectools/master.tar.gz -C /sectools && \
     rm /sectools/master.tar.gz
 
+HEALTHCHECK --interval=30s --timeout=5s --start-period=120s --retries=3 CMD curl --fail http://localhost:8080/status || exit 1
+
 COPY Gemfile src/
 
 RUN bundle install --gemfile=/sectools/src/Gemfile

src/main.rb

@@ -15,7 +15,7 @@
 get '/status' do
 
 	status 500
-	if (healthcheck(client.last_connect) == "UP")
+	if (scanner_test == "SUCCESSFUL")
 		status 200
 	end
 
@@ -46,7 +46,7 @@
 end
 
 def healthcheck(connection)
-	if (connection != "ERROR" && scanner_test == "SUCCESSFULL")
+	if (connection != "ERROR" && scanner_test == "SUCCESSFUL")
 		return "UP"
 	end
 	return "DOWN"
@@ -55,7 +55,7 @@ def healthcheck(connection)
 def scanner_test
 	system('perl /sectools/nikto-master/program/nikto.pl -Version > /dev/null')
 	if $? == 0
-		return "SUCCESSFULL"
+		return "SUCCESSFUL"
 	else
 		return "FAILED"
 	end