summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWild Kat <wk@futureinquestion.net>2018-04-25 21:14:45 +0200
committerWild Kat <wk@futureinquestion.net>2018-04-25 21:14:45 +0200
commit0b120ee56759ef0299882ceb766954b1a73abf33 (patch)
tree3ed7b1081c56e89b136097ab4257a90c6d46474a
parent128e14caea19d283adcf814df39b9aa7440e8c09 (diff)
change docker build process to use rake
-rw-r--r--Dockerfile7
-rw-r--r--README.md1
2 files changed, 4 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 07adc0f..c928a2d 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,7 @@ RUN gem install aws-sdk slack-api xmpp4r
COPY . /tmp/oxidized/
WORKDIR /tmp/oxidized
-RUN gem build oxidized.gemspec
-RUN gem install oxidized-*.gem
+RUN rake install
# web interface
RUN gem install oxidized-web --no-ri --no-rdoc
@@ -49,7 +48,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
diff --git a/README.md b/README.md
index d5c4b9b..04c9137 100644
--- a/README.md
+++ b/README.md
@@ -119,6 +119,7 @@ pkg install rubygem-oxidized rubygem-oxidized-script rubygem-oxidized-web
```shell
git clone https://github.com/ytti/oxidized.git
cd oxidized/
+gem install bundler
rake install
```