From 695d3a2147276cd6f00345b538712d19b4c9234c Mon Sep 17 00:00:00 2001 From: Jerome Sagnole Date: Wed, 11 Oct 2017 21:11:32 +0200 Subject: [PATCH] correct issue directory missing, and reduce number step on dockerbuild --- .../builder/debian/jessie/x86_64/Dockerfile | 23 ++++++++----------- .../builder/debian/jessie/x86_64/build.sh | 7 +++--- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/dist/docker/builder/debian/jessie/x86_64/Dockerfile b/dist/docker/builder/debian/jessie/x86_64/Dockerfile index c8e1e545d..5cad364ce 100644 --- a/dist/docker/builder/debian/jessie/x86_64/Dockerfile +++ b/dist/docker/builder/debian/jessie/x86_64/Dockerfile @@ -30,20 +30,17 @@ MAINTAINER AleaJactaEst ENV HOSTNAME builder -RUN apt-get update -RUN apt-get dist-upgrade -y - -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server - -RUN apt-get install -y apache2 \ +RUN apt-get update ; \ + apt-get dist-upgrade -y ; \ + DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server ; \ + apt-get install -y apache2 \ php5 \ libapache2-mod-php5 \ php5-mysql \ apache2-utils \ php5-gd \ - php5-imagick - -RUN apt-get install -y git \ + php5-imagick ; \ + apt-get install -y git \ libcurl4-openssl-dev \ libluabind-dev \ libfreetype6-dev \ @@ -56,7 +53,8 @@ RUN apt-get install -y git \ libogg-dev \ libvorbis-dev \ libxml2-dev \ - cmake build-essential \ + cmake \ + build-essential \ libpng12-dev \ libjpeg62-turbo-dev \ rrdtool \ @@ -76,9 +74,8 @@ RUN apt-get install -y git \ libopenal-dev \ libgl1-mesa-dev \ libogg-dev \ - mercurial - -RUN apt-get install -y wget + mercurial \ + wget ## Build & Install cpptest # Impossible to build release 1.1.0, 1.1.1, 1.1.2 diff --git a/dist/docker/builder/debian/jessie/x86_64/build.sh b/dist/docker/builder/debian/jessie/x86_64/build.sh index 6e28ff889..9450a1582 100755 --- a/dist/docker/builder/debian/jessie/x86_64/build.sh +++ b/dist/docker/builder/debian/jessie/x86_64/build.sh @@ -34,8 +34,9 @@ declare DOCKERBUILDOPT="" declare IMAGEDOCKER="builder_khanat_debian_jessie_x86_64" declare LOCALBUILDDIR="build/$IMAGEDOCKER" declare LOCALSRC="debian/jessie/x86_64" -declare PACKAGEBIN="output/khanat_debian_jessie_x86_64/package/ryzomcore_jessie_x86_64.tar.gz" -declare PACKAGEREF="output/khanat_debian_jessie_x86_64/package/khanat-ref-ressources.tar.gz" +declare DIRPACKAGE="output/khanat_debian_jessie_x86_64/package" +declare PACKAGEBIN="$DIRPACKAGE/ryzomcore_jessie_x86_64.tar.gz" +declare PACKAGEREF="$DIRPACKAGE/khanat-ref-ressources.tar.gz" usage() @@ -248,7 +249,7 @@ fi if [[ $BUILD -ne 0 ]] then msg_info "COPY PACKAGES" - mkdir -p output/package/ + mkdir -p "$rootdir/$DIRPACKAGE" cd ${rootdir}; tar czf ${PACKAGEREF} \ code/ryzom/server/shard.screen.rc \ code/ryzom/common/* \