Skip to content

Update things #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 7 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
FROM java
FROM openjdk:alpine

LABEL maintainer "Jeff Sippel <[email protected]>"

RUN apt-get update
RUN apt-get install -y ruby ruby-nokogiri
RUN apk update && \
apk upgrade && \
apk add --no-cache ruby ruby-nokogiri ruby-json

RUN adduser -u 9000 --disabled-password --quiet --gecos "" app
RUN addgroup -g 9000 -S code && \
adduser -S -G code app
USER app

WORKDIR /usr/src/app

COPY scalastyle_config.xml /usr/src/app/
COPY scalastyle_2.11-0.6.0-batch.jar /usr/src/app/

COPY . /usr/src/app

VOLUME /code
WORKDIR /code
VOLUME /code

CMD ["/usr/src/app/bin/scalastyle"]
6 changes: 3 additions & 3 deletions lib/cc/engine/scalastyle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def initialize(directory: , io: , engine_config: )

def run
exec_scalastyle_with_options

Dir.chdir(@directory) do
next unless results
results.xpath('//file').each do |file|
Expand Down Expand Up @@ -57,7 +57,7 @@ def analysis_files
end

def scalastyle_jar
'/usr/src/app/scalastyle_2.11-0.6.0-batch.jar'
'/usr/src/app/scalastyle_2.12-1.0.0-batch.jar'
end

def scalastyle_config
Expand All @@ -80,7 +80,7 @@ def results
@results ||= Nokogiri::XML(File.read(results_xml_file_path))
end
end

end
end
end
Binary file removed scalastyle_2.11-0.6.0-batch.jar
Binary file not shown.
Binary file added scalastyle_2.12-1.0.0-batch.jar
Binary file not shown.