diff options
| author | Ron <rgnv@users.noreply.github.com> | 2018-04-27 06:24:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 06:24:56 -0700 |
| commit | 2bb40ad4d9e31cf2cd63a373f7c607eb86547e46 (patch) | |
| tree | c12b52f0acd5192c457fa07189c4946674cd11fb /Dockerfile | |
| parent | ec90b081f0fed05497ce6ae21e4b4ba4d44ecc01 (diff) | |
| parent | 83a00943d7333fafdfe352173713a22a5ac89f6f (diff) | |
Merge pull request #1 from wk/pr-1280
massage into rubocop compliance
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -23,7 +23,7 @@ LABEL maintainer="Samer Abdel-Hafez <sam@arahant.net>" # set up dependencies for the build process RUN apt-get -yq update && \ - apt-get -yq install ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ libffi-dev + apt-get -yq install ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake libssh2-1-dev git g++ libffi-dev ruby-bundler # upgrade libssh2 to self-built backport from stage 1 COPY --from=libssh2-backport \ @@ -33,14 +33,15 @@ COPY --from=libssh2-backport \ RUN dpkg -i /tmp/*.deb # dependencies for hooks -RUN gem install aws-sdk slack-api xmpp4r +RUN gem install aws-sdk slack-api xmpp4r cisco_spark # build and install oxidized COPY . /tmp/oxidized/ WORKDIR /tmp/oxidized -RUN gem build oxidized.gemspec -RUN gem install oxidized-*.gem +# docker automated build gets shallow copy, but non-shallow copy cannot be unshallowed +RUN git fetch --unshallow || true +RUN rake install # web interface RUN gem install oxidized-web --no-ri --no-rdoc @@ -49,7 +50,7 @@ RUN gem install oxidized-web --no-ri --no-rdoc WORKDIR / RUN rm -rf /tmp/oxidized RUN rm /tmp/*.deb -RUN apt-get -yq --purge autoremove ruby-dev pkg-config make cmake +RUN apt-get -yq --purge autoremove ruby-dev pkg-config make cmake ruby-bundler # add runit services ADD extra/oxidized.runit /etc/service/oxidized/run |