diff options
| author | KodApa85 <parsons151185@gmail.com> | 2018-04-27 13:48:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 13:48:47 +0100 |
| commit | a40bb72e78755891ec84f5a4378c30114dae8316 (patch) | |
| tree | 5e057527f163fa1bea10cbdc7318b035ff939200 /Dockerfile | |
| parent | dbbe6af563072b62e373a9824c6a23482d20896e (diff) | |
| parent | f530a50a949310aa9996d764eeaaba7458b7d6b6 (diff) | |
Merge branch 'master' into xgs4600-cli
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 9 |
1 files changed, 5 insertions, 4 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 \ @@ -39,8 +39,9 @@ RUN gem install aws-sdk slack-api xmpp4r 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 |