Commit 1966f289 authored by Yann Garcia's avatar Yann Garcia
Browse files

Reorganize ETSI-CTI TITAN docker

parent 0b58e78e

from-sources/Dockerfile.stfubuntu

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,6 @@ RUN echo "docker-STF-dev" > /etc/hostname \ 
    && DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \

    && DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \

    && DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y \

    && DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y \

    && DEBIAN_FRONTEND=noninteractive apt-get update \

    && DEBIAN_FRONTEND=noninteractive apt-get update \

    && ( echo "oracle-java10-installer shared/accepted-oracle-license-v1-1 boolean true" | debconf-set-selections -v ) \

    && DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install -y \

    && DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install -y \

      autoconf \

      autoconf \

      bison \

      bison \
@@ -42,6 +41,7 @@ RUN echo "docker-STF-dev" > /etc/hostname \ 
      libxml2-dev \

      libxml2-dev \

      lsof \

      lsof \

      ntp \

      ntp \

      oracle-java11-set-default \

      pkg-config \

      pkg-config \

      qt5-default \

      qt5-default \

      qtmultimedia5-dev \

      qtmultimedia5-dev \

from-sources/build.sh

+2 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,8 @@ set -e 
set -vx

set -vx





#check and build stfubuntu image

#check and build stfubuntu image

DOCKER_ID=`docker ps -a | grep -e stfubuntu | awk '{ print $1 }'`

docker rm --force ${DOCKER_ID}

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