summaryrefslogtreecommitdiff
path: root/Dockerfile
diff options
context:
space:
mode:
authorWild Kat <wk@futureinquestion.net>2018-04-27 12:37:26 +0200
committerWild Kat <wk@futureinquestion.net>2018-04-27 12:37:26 +0200
commit8f1ac4ad5503ac4a59d41ebc3f142c1d5d097bfb (patch)
tree8860b268793dd783b9b5cd5d1a255fe1edebfb0e /Dockerfile
parentcd92bac4a582eb8e19d9d036455591c9684eae72 (diff)
parent34fd5369feee94ab45c5a81d7769b1df717e4c8c (diff)
Merge remote-tracking branch 'upstream/master' into pr-1280
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile9
1 files changed, 5 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 89772db..61b5c71 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 cisco_spark
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