aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-09-19 19:20:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct issue directory missing, and reduce number step on dockerbuild

Browse source
This commit is contained in:
Jerome Sagnole 2017-10-11 21:11:32 +02:00
parent 7f6296574a
commit 695d3a2147
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
dist/docker/builder/debian/jessie/x86_64/Dockerfile vendored
View file

@ -30,20 +30,17 @@ MAINTAINER AleaJactaEst
ENV HOSTNAME builder ENV HOSTNAME builder
RUN apt-get update RUN apt-get update ; \
RUN apt-get dist-upgrade -y apt-get dist-upgrade -y ; \
DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server ; \
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-server apt-get install -y apache2 \
RUN apt-get install -y apache2 \
php5 \ php5 \
libapache2-mod-php5 \ libapache2-mod-php5 \
php5-mysql \ php5-mysql \
apache2-utils \ apache2-utils \
php5-gd \ php5-gd \
php5-imagick php5-imagick ; \
apt-get install -y git \
RUN apt-get install -y git \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libluabind-dev \ libluabind-dev \
libfreetype6-dev \ libfreetype6-dev \
@ -56,7 +53,8 @@ RUN apt-get install -y git \
libogg-dev \ libogg-dev \
libvorbis-dev \ libvorbis-dev \
libxml2-dev \ libxml2-dev \
cmake build-essential \ cmake \
build-essential \
libpng12-dev \ libpng12-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
rrdtool \ rrdtool \
@ -76,9 +74,8 @@ RUN apt-get install -y git \
libopenal-dev \ libopenal-dev \
libgl1-mesa-dev \ libgl1-mesa-dev \
libogg-dev \ libogg-dev \
mercurial mercurial \
wget
RUN apt-get install -y wget
## Build & Install cpptest ## Build & Install cpptest
# Impossible to build release 1.1.0, 1.1.1, 1.1.2 # Impossible to build release 1.1.0, 1.1.1, 1.1.2

7
dist/docker/builder/debian/jessie/x86_64/build.sh vendored
View file

@ -34,8 +34,9 @@ declare DOCKERBUILDOPT=""
declare IMAGEDOCKER="builder_khanat_debian_jessie_x86_64" declare IMAGEDOCKER="builder_khanat_debian_jessie_x86_64"
declare LOCALBUILDDIR="build/$IMAGEDOCKER" declare LOCALBUILDDIR="build/$IMAGEDOCKER"
declare LOCALSRC="debian/jessie/x86_64" declare LOCALSRC="debian/jessie/x86_64"
declare PACKAGEBIN="output/khanat_debian_jessie_x86_64/package/ryzomcore_jessie_x86_64.tar.gz" declare DIRPACKAGE="output/khanat_debian_jessie_x86_64/package"
declare PACKAGEREF="output/khanat_debian_jessie_x86_64/package/khanat-ref-ressources.tar.gz" declare PACKAGEBIN="$DIRPACKAGE/ryzomcore_jessie_x86_64.tar.gz"
declare PACKAGEREF="$DIRPACKAGE/khanat-ref-ressources.tar.gz"
usage() usage()
@ -248,7 +249,7 @@ fi
if [[ $BUILD -ne 0 ]] if [[ $BUILD -ne 0 ]]
then then
msg_info "COPY PACKAGES" msg_info "COPY PACKAGES"
mkdir -p output/package/ mkdir -p "$rootdir/$DIRPACKAGE"
cd ${rootdir}; tar czf ${PACKAGEREF} \ cd ${rootdir}; tar czf ${PACKAGEREF} \
code/ryzom/server/shard.screen.rc \ code/ryzom/server/shard.screen.rc \
code/ryzom/common/* \ code/ryzom/common/* \