From cd466cc2d11c276f125d909b3196553570666537 Mon Sep 17 00:00:00 2001 From: Wild Kat Date: Fri, 6 Apr 2018 20:51:10 +0200 Subject: reorder dockerfile gem installation --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 36c650c..07adc0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,6 +32,9 @@ COPY --from=libssh2-backport \ /tmp/ RUN dpkg -i /tmp/*.deb +# dependencies for hooks +RUN gem install aws-sdk slack-api xmpp4r + # build and install oxidized COPY . /tmp/oxidized/ WORKDIR /tmp/oxidized @@ -42,9 +45,6 @@ RUN gem install oxidized-*.gem # web interface RUN gem install oxidized-web --no-ri --no-rdoc -# dependencies for hooks -RUN gem install aws-sdk slack-api xmpp4r - # clean up WORKDIR / RUN rm -rf /tmp/oxidized -- cgit v1.2.1 From cd92bac4a582eb8e19d9d036455591c9684eae72 Mon Sep 17 00:00:00 2001 From: Wild Kat Date: Sun, 15 Apr 2018 09:29:32 +0200 Subject: add cisco_spark gem to docker container for ciscosparkdiff hook --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 07adc0f..89772db 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,7 @@ 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/ -- cgit v1.2.1 From 0b120ee56759ef0299882ceb766954b1a73abf33 Mon Sep 17 00:00:00 2001 From: Wild Kat Date: Wed, 25 Apr 2018 21:14:45 +0200 Subject: change docker build process to use rake --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 07adc0f..c928a2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ LABEL maintainer="Samer Abdel-Hafez " # 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 -- cgit v1.2.1 From 4ffe710f6fa5d48777f0b5e881013b95c9b85c69 Mon Sep 17 00:00:00 2001 From: Saku Ytti Date: Thu, 26 Apr 2018 02:56:36 +0300 Subject: unshallow docker git checkout --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index c928a2d..b4bdae9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,6 +39,8 @@ RUN gem install aws-sdk slack-api xmpp4r COPY . /tmp/oxidized/ WORKDIR /tmp/oxidized +# docker automated build gets shallow copy, but non-shallow copy cannot be unshallowed +RUN git --fetch unshallow || true RUN rake install # web interface -- cgit v1.2.1 From d03dca1a7b69b309b1b4a597a921b0b5b45f0e8f Mon Sep 17 00:00:00 2001 From: Wild Kat Date: Thu, 26 Apr 2018 10:27:40 +0200 Subject: Use actual git commands that exist --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index b4bdae9..0ba8b7f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,7 +40,7 @@ COPY . /tmp/oxidized/ WORKDIR /tmp/oxidized # docker automated build gets shallow copy, but non-shallow copy cannot be unshallowed -RUN git --fetch unshallow || true +RUN git fetch --unshallow || true RUN rake install # web interface -- cgit v1.2.1