garfield/wpscan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix rspecs

Browse Source
This commit is contained in:
Christian Mehlmauer
2017-05-02 15:37:38 +02:00
parent 5f77832386
commit 20af778fa1
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
.ash_history
cache cache
coverage coverage
.bundle .bundle

4
Dockerfile
View File

@@ -12,7 +12,7 @@ COPY Gemfile.lock /wpscan
# runtime dependencies # runtime dependencies
RUN apk add --no-cache libcurl procps && \ RUN apk add --no-cache libcurl procps && \
# build dependencies # build dependencies
apk add --no-cache --virtual build-deps libcurl ruby-dev libffi-dev make gcc musl-dev zlib-dev procps && \ apk add --no-cache --virtual build-deps alpine-sdk ruby-dev libffi-dev zlib-dev && \
bundle install --system --gemfile=/wpscan/Gemfile $BUNDLER_ARGS && \ bundle install --system --gemfile=/wpscan/Gemfile $BUNDLER_ARGS && \
apk del --no-cache build-deps apk del --no-cache build-deps
@@ -23,5 +23,7 @@ USER wpscan
RUN /wpscan/wpscan.rb --update --verbose --no-color RUN /wpscan/wpscan.rb --update --verbose --no-color
WORKDIR /wpscan
ENTRYPOINT ["/wpscan/wpscan.rb"] ENTRYPOINT ["/wpscan/wpscan.rb"]
CMD ["--help"] CMD ["--help"]

8
Gemfile.lock
View File

@@ -10,8 +10,8 @@ GEM
ethon (0.10.1) ethon (0.10.1)
ffi (>= 1.3.0) ffi (>= 1.3.0)
ffi (1.9.18) ffi (1.9.18)
hashdiff (0.3.2) hashdiff (0.3.4)
json (2.0.4) json (2.1.0)
mini_portile2 (2.1.0) mini_portile2 (2.1.0)
nokogiri (1.7.1) nokogiri (1.7.1)
mini_portile2 (~> 2.1.0) mini_portile2 (~> 2.1.0)
@@ -44,7 +44,7 @@ GEM
typhoeus (1.1.2) typhoeus (1.1.2)
ethon (>= 0.9.0) ethon (>= 0.9.0)
unicode-display_width (1.1.3) unicode-display_width (1.1.3)
webmock (3.0.0) webmock (3.0.1)
addressable (>= 2.3.6) addressable (>= 2.3.6)
crack (>= 0.3.2) crack (>= 0.3.2)
hashdiff hashdiff
@@ -66,4 +66,4 @@ DEPENDENCIES
yajl-ruby (>= 1.3.0) yajl-ruby (>= 1.3.0)
BUNDLED WITH BUNDLED WITH
1.14.3 1.14.6

7
bin/rspec
View File

@@ -10,11 +10,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
cd $DIR/../ cd $DIR/../
# always rebuild and include all GEMs # always rebuild and include all GEMs
docker build --build-arg "BUNDLER_ARGS=--system --jobs=8" -t wpscan:rspec . docker build --build-arg "BUNDLER_ARGS=--jobs=8" -t wpscan:rspec .
# update all gems (this updates Gemfile.lock on the host) # update all gems (this updates Gemfile.lock on the host)
docker run --rm -u root -v $DIR/../Gemfile.lock:/wpscan/Gemfile.lock --entrypoint "" wpscan:rspec bundle update # this also needs some build dependencies
docker run --rm -u root -v $DIR/../Gemfile.lock:/wpscan/Gemfile.lock --entrypoint "" wpscan:rspec sh -c 'apk add --no-cache alpine-sdk ruby-dev libffi-dev zlib-dev && bundle update'
# rebuild image with latest GEMs # rebuild image with latest GEMs
docker build --build-arg "BUNDLER_ARGS=--system --jobs=8" -t wpscan:rspec . docker build --build-arg "BUNDLER_ARGS=--jobs=8" -t wpscan:rspec .
# run spec # run spec
docker run --rm -v $DIR/../:/wpscan --entrypoint "" wpscan:rspec rspec docker run --rm -v $DIR/../:/wpscan --entrypoint "" wpscan:rspec rspec