Commit 94788707 authored by Yann Garcia's avatar Yann Garcia
Browse files

Reorganize ETSI-CTI TITAN docker

parent 9f25b48b

.jenkins.sh

+1 −1
Changes for .jenkins.sh: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line 
#!/bin/bash

#!/bin/bash





set -e

#set -e

set -vx

set -vx





#echo "Building titan:binaries"

#echo "Building titan:binaries"

from-sources/.jenkins.sh

+1 −1
Changes for from-sources/.jenkins.sh: 1 added line, 1 removed line.
Original line number Original line Diff line number Diff line 
#!/bin/bash

#!/bin/bash





#set -e

set -vx

set -vx

set -e





cd $(dirname $0)

cd $(dirname $0)

from-sources/build.sh

+6 −1
Changes for from-sources/build.sh: 6 added lines, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Copyright ETSI 2019

# Copyright ETSI 2019

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt





set -e

#set -e

set -vx

set -vx





#check and build stfubuntu image

#check and build stfubuntu image
@@ -11,6 +11,11 @@ if [ ! -z "${DOCKER_ID}" ] 
then

then

    docker rm --force ${DOCKER_ID}

    docker rm --force ${DOCKER_ID}

fi

fi

DOCKER_IMAGES=`docker images -a -q`

if [ ! -z "${DOCKER_IMAGES}" ]

then

    docker rmi ${DOCKER_IMAGES}

fi

if [ -z `docker images -q stfubuntu` ]; then

if [ -z `docker images -q stfubuntu` ]; then

  docker build --tag stfubuntu:18.04 -f Dockerfile.stfubuntu --force-rm  . || exit 1

  docker build --tag stfubuntu:18.04 -f Dockerfile.stfubuntu --force-rm  . || exit 1

fi

fi