several docker improvements (6fd37282) · Commits · EMTEL - Emergency Communications / NG112 Conformance Test Suites

.jenkins.sh

+2 −4

Original line number	Diff line number	Diff line
		@@ -9,7 +9,5 @@ cd "$(dirname "$0")"

		run_dir="$(pwd)"

		cd docker

		./build-container.sh
		./run-container.sh "${run_dir}"
		./docker/build-container.sh
		./docker/run-container.sh "${run_dir}"

docker/Dockerfile

+31 −31

Original line number	Diff line number	Diff line
		@@ -7,13 +7,11 @@ LABEL description="STF549 Docker Image"
		ENV TERM=xterm
		ENV HOSTNAME docker-titan-STF549

		RUN echo "docker-titan-STF549" > /etc/hostname \
		&& echo "root:etsi" \| chpasswd \
		&& DEBIAN_FRONTEND=noninteractive apt-get update \
		&& DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y \
		RUN DEBIAN_FRONTEND=noninteractive apt-get update \
		&& DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \
		&& DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y \
		&& DEBIAN_FRONTEND=noninteractive apt-get update \
		&& DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y

		RUN DEBIAN_FRONTEND=noninteractive apt-get update \
		&& DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install -y \
		autoconf \
		bison \
		@@ -65,10 +63,16 @@ RUN echo "docker-titan-STF549" > /etc/hostname \
		xsltproc \
		&& DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y \
		&& DEBIAN_FRONTEND=noninteractive apt-get autoclean \
		&& useradd --create-home --shell /bin/bash --groups sudo etsi \
		&& rm -rf /var/lib/apt/lists/*

		RUN echo "docker-titan-STF549" > /etc/hostname \
		&& echo "root:etsi" \| chpasswd

		RUN useradd --create-home --shell /bin/bash --groups sudo etsi \
		&& echo "etsi:etsi" \| chpasswd \
		&& adduser etsi sudo \
		&& cd /home/etsi \
		&& adduser etsi sudo

		RUN cd /home/etsi \
		&& echo "" >> /home/etsi/.bashrc \
		&& echo "export HOME=/home/etsi" >> /home/etsi/.bashrc \
		&& echo "export LD_LIBRARY_PATH=/home/etsi/dev/etsi_emcom/lib:$LD_LIBRARY_PATH" >> /home/etsi/.bashrc \
		@@ -80,12 +84,25 @@ RUN echo "docker-titan-STF549" > /etc/hostname \
		&& chown etsi:etsi bin lib include tmp frameworks docs man dev \
		&& echo "etsi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers

		COPY . /home/etsi/dev/STF549_Ng112/
		RUN chown -R etsi /home/etsi/dev/STF549_Ng112/

		USER etsi

		RUN cd /home/etsi/dev \
		&& git clone https://forge.etsi.org/gitlab/emergency-communications/NG112 ./STF549_Ng112 \
		&& cd /home/etsi/dev/STF549_Ng112 \
		&& git checkout TTCN_3_Developments \
		RUN cd /home/etsi/frameworks \
		&& git clone https://github.com/YannGarcia/osip.git ./osip \
		&& cd osip \
		&& ./autogen.sh \
		&& ./configure --prefix=/home/etsi \
		&& make && make install

		RUN cd /home/etsi/frameworks \
		&& wget -q 'http://ftp.halifax.rwth-aachen.de/eclipse//technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz

		RUN cd /home/etsi/dev/STF549_Ng112 \
		&& ls \
		&& cd /home/etsi/dev/STF549_Ng112/ttcn \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibSip/trunk ./LibSip \
		&& svn co --username svnusers --password svnusers --non-interactive --trust-server-cert https://oldforge.etsi.org/svn/LibCommon/trunk/ttcn ./LibCommon \
		@@ -96,25 +113,8 @@ RUN cd /home/etsi/dev \
		&& ln -sf /home/etsi/dev/STF549_Ng112/scripts/devenv.bash.ubuntu /home/etsi/devenv.bash \
		&& ls -ltr /home/etsi \
		&& export HOME=/home/etsi \
		&& cd /home/etsi/frameworks \
		&& git clone https://github.com/YannGarcia/osip.git ./osip \
		&& cd osip \
		&& ./autogen.sh \
		&& ./configure --prefix=/home/etsi \
		&& make && make install \
		&& cd /home/etsi/frameworks \
		&& wget 'http://ftp.halifax.rwth-aachen.de/eclipse//technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
		&& . /home/etsi/devenv.bash \
		&& cd /home/etsi/dev/STF549_Ng112/scripts \
		&& ./build_titan.bash \
		&& . /home/etsi/devenv.bash \
		&& ./update_emcom_project.bash \
		&& cd ${HOME}/dev/etsi_emcom/src/AtsNg112/objs \
		&& ../bin/ng112.bash \
		&& ../bin/run_all.bash

		CMD ["/bin/bash"]
		&& ./build_titan.bash

		# That's all Floks

docker/build-container.sh

+2 −9

Original line number	Diff line number	Diff line
		@@ -5,22 +5,15 @@
		#set -e
		#set -vx

		DOCKER_FILE=./Dockerfile
		DOCKER_FILE=./docker/Dockerfile
		if [ -f ${DOCKER_FILE} ]
		then
		docker build --tag stf549_ng112 --force-rm .
		docker build --tag stf549_ng112 -f ${DOCKER_FILE} .
		if [ "$?" != "0" ]
		then
		echo "Docker build failed: $?"
		exit -1
		fi
		docker image ls -a
		docker inspect stf549_ng112:latest
		if [ "$?" != "0" ]
		then
		echo "Docker inspect failed: $?"
		exit -1
		fi
		else
		exit -2
		fi

docker/run-container.sh

+6 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,12 @@
		#set -e
		#set -vx

		docker run -it --rm stf549_ng112:latest /bin/bash
		docker run stf549_ng112:latest "/bin/bash" \
		-c "source /home/etsi/devenv.bash \
		&& /home/etsi/dev/STF549_Ng112/scripts/update_emcom_project.bash \
		&& cd ${HOME}/dev/etsi_emcom/src/AtsNg112/objs \
		&& ../bin/ng112.bash \
		&& ../bin/run_all.bash"

		# That's all Floks
		exit 0

Admin message