From 9624e343afff1c69d355de5884fb47600437d7f6 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 25 Sep 2018 11:46:23 -0700 Subject: [PATCH] fix dockerfile --- .travis.yml | 4 ++-- Dockerfile | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2712244d..86cd002f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,8 @@ install: - docker build -t cabaletta/baritone . script: -- docker run cabaletta/baritone /bin/sh -c "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 128x128x24 -ac +extension GLX +render; DISPLAY=:99 BARITONE_AUTO_TEST=true ./gradlew runClient; sh scripts/build.sh" -- docker cp $(docker ps -a -q):/code/dist dist +- docker run --name baritone cabaletta/baritone /bin/sh -c "/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 128x128x24 -ac +extension GLX +render; sh scripts/build.sh; DISPLAY=:99 BARITONE_AUTO_TEST=true ./gradlew runClient" +- docker cp baritone:/code/dist dist - ls dist deploy: diff --git a/Dockerfile b/Dockerfile index db565b76..a6d8d686 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,8 @@ RUN apt install --target-release jessie-backports \ RUN apt install -qq --force-yes mesa-utils libgl1-mesa-glx libxcursor1 libxrandr2 libxxf86vm1 x11-xserver-utils xfonts-base xserver-common +RUN apt install -qq --force-yes unzip wget + ADD . /code RUN echo "\nrunClient {\nargs \"--width\",\"128\",\"--height\",\"128\"\n}" >> /code/build.gradle