Commit 4f45ead2 authored by garciay's avatar garciay
Browse files

Update Dockerfile according to STF549_NG112

parent bbf3737e

docker/Dockerfile

+7 −7
Original line number Diff line number Diff line
@@ -72,16 +72,16 @@ RUN echo "docker-titan-STF525" > /etc/hostname \ 
    && echo "export LD_LIBRARY_PATH=/home/etsi/TriesAndDelete/etsi_its/lib:$LD_LIBRARY_PATH" >> /etc/profile \

    && echo "export PATH=/home/etsi/bin:$PATH" >> /etc/profile \

    && echo "cd /home/etsi" >> /etc/profile \

    && echo ". ./devenv.bash" >> /etc/profile 

    && echo ". ./devenv.bash" >> /etc/profile \

    && cd /home/etsi \

    && mkdir -p .ssh bin lib include tmp frameworks docs man dev \

    && chown etsi:etsi .ssh bin lib include tmp frameworks docs man dev



USER etsi



RUN cd /home/etsi \

    && mkdir -p .ssh bin lib include tmp frameworks docs man dev \

    && echo "$ssh_pub_key" > /home/etsi/.ssh/id_rsa \

    && chmod 755 /home/etsi/.ssh/id_rsa \

    && cat /home/etsi/.ssh/id_rsa \

    && cd /home/etsi/dev \

ADD id_rsa* /home/etsi/.ssh/



RUN cd /home/etsi/dev \

    && svn co --non-interactive svn+ssh://oldforge.etsi.org/svn/ITS/branches/STF525 ./STF525_Its \

    && cd /home/etsi/dev/STF525_Its/scripts \

    && chmod 775 *.bash devenv.bash.* \

docker/build-container.sh

+3 −6
Original line number Diff line number Diff line
@@ -8,12 +8,9 @@ set -vx 
DOCKER_FILE=./Dockerfile

if [ -f ${DOCKER_FILE} ]

then

    IMAGES=$(docker images -q)

    if [ "${IMAGES}" != "" ]

    then

      docker rmi -f $(docker images -q)

    fi

    docker build --tag stf525_its --force-rm --build-arg ssh_pub_key="$(cat ~/.ssh/id_rsa.pub)" .

    cp ~/.ssh/id_rsa* .

    docker build --tag stf525_its --force-rm .

    rm ./id_rsa*

    if [ "$?" != "0" ]

    then

        echo "Docker build failed: $?"