Skip to content

Commit

Permalink
Merge pull request #323 from VirtualFlyBrain/release_march_2019
Browse files Browse the repository at this point in the history
Build fix from Release march 2019
  • Loading branch information
Robbie1977 authored Mar 27, 2019
2 parents 9cd5b14 + efc9b79 commit 0946c7e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ script:
fi
- echo -e "travis_fold:end:Geppetto-Config" || true
- echo -e "travis_fold:start:Docker-Build" || true
- travis_wait 200 docker build --no-cache --pull -t $REPO:$COMMIT .
- travis_wait 200 docker build -t $REPO:$COMMIT .
- echo -e "travis_fold:end:Docker-Build" || true
- echo -e "travis_fold:start:Docker-Run" || true
- travis_wait 200 docker network create -d bridge --subnet 192.168.0.0/24 --gateway 192.168.0.1 dockernet
Expand Down
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ ENV VFB_SOLR_SERVER=solr.virtualflybrain.org

USER root

RUN apt-get update && apt-get install -qq -y sudo xvfb
COPY dockerFiles/sources.list /etc/apt/sources.list

RUN rm /etc/apt/sources.list.d/jessie-backports.list

RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -qq -y sudo xvfb

RUN useradd -ms /bin/bash developer

Expand Down Expand Up @@ -115,7 +119,7 @@ USER developer

#VIRGO INSTALL
USER root
RUN apt-get update && apt-get install -qq -y curl bsdtar locate
RUN apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -qq -y curl bsdtar locate
USER developer
RUN mkdir -p /home/developer/virgo
RUN curl -L 'http://www.eclipse.org/downloads/download.php?file=/virgo/release/VP/3.7.2.RELEASE/virgo-tomcat-server-3.7.2.RELEASE.zip&r=1' | bsdtar --strip-components 1 -C /home/developer/virgo -xzf -
Expand Down
8 changes: 8 additions & 0 deletions dockerFiles/sources.list
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
deb http://deb.debian.org/debian/ jessie main
deb-src http://deb.debian.org/debian/ jessie main

deb http://security.debian.org/ jessie/updates main
deb-src http://security.debian.org/ jessie/updates main

deb http://archive.debian.org/debian jessie-backports main
deb-src http://archive.debian.org/debian jessie-backports main

0 comments on commit 0946c7e

Please sign in to comment.