Skip to content

P
proview
Commit 73a09ad5 authored by Claes's avatar Claes Committed by Esteban Blanc
Browse files
Options

Dockerfiles modifications

parent f79a1847
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 54 deletions
src/tools/docker/build/Dockerfile.build 0 → 100644
View file @ 73a09ad5
ARG RELEASE=debian:10
FROM $RELEASE
ARG BUILD_RPI
ARG GITREPO
ARG INSTALL_UPDATE
ARG INSTALL_GIT
ARG INSTALL_BUILD
ARG INSTALL_RPI
ARG JDK_DIR
ENV DISPLAY :1
ENV DEBIAN_FRONTEND none_interactive
COPY ./build/build.sh ./build/build_pwrdemo.sh ./build/build_pkg.sh ./build/build_pwrtest01.sh ./build/build_rpi.sh ./
RUN $INSTALL_UPDATE
RUN $INSTALL_GIT
RUN apt-get install -y xserver-xorg-video-dummy
RUN git clone $GITREPO
#RUN mv proview pwr;
RUN $INSTALL_BUILD
RUN ./build.sh $JDK_DIR
RUN ./build_pwrdemo.sh
RUN ./build_pwrtest01.sh
RUN $INSTALL_RPI
RUN ./build_rpi.sh
RUN ./build_pkg.sh
src/tools/docker/pwrtest01c/Dockerfile.pwrtest01c 0 → 100644
View file @ 73a09ad5
ARG RELEASE=debian:10
FROM $RELEASE
ARG INSTALL_UPDATE
ARG INSTALL_PWRRT
ARG PKG_PWRRT
ENV DISPLAY :1
ENV DEBIAN_FRONTEND none_interactive
COPY ./pwrtest01c/test_pwrtest01c.sh ./$PKG_PWRRT ./pwrp_pkg_pwrtest01c_0001.tgz ./dummy_display_xorg.conf ./
RUN $INSTALL_UPDATE
RUN $INSTALL_PWRRT
RUN apt-get install -y xserver-xorg-video-dummy
RUN dpkg -i $PKG_PWRRT
RUN mv ./pwrp_pkg_pwrtest01c_0001.tgz /home/pwrp/
RUN ./test_pwrtest01c.sh
src/tools/docker/pwrtest01c/test_pwrtest01c.sh 0 → 100755
View file @ 73a09ad5
#!/bin/bash
echo "Here in test_pwrtest01b.sh"
Xorg -noreset +extension GLX +extension RANDR +extension RENDER -config ./dummy_display_xorg.conf :99 &
sleep 20
su - pwrp
cd /home/pwrp
pwd
source .bashrc
export DISPLAY=:99
pwd
ls -l
export PWR_BUS_ID=999
export PYTHONPATH=$pwr_exe
pwr_pkg.sh -i /home/pwrp/pwrp_pkg_pwrtest01c_0001.tgz
# Rename boot, node and plcfiles
nname=`eval uname -n`
bootfile=`eval ls -1 $pwrp_load/ld_boot*.dat`
nodefile=`eval ls -1 $pwrp_load/ld_node*.dat`
plcfile=`eval ls -1 $pwrp_exe/plc_*_0999_plc`
echo "19-MAR-2020 17:06:54.32" > $pwrp_load/ld_boot_"$nname"_0999.dat
echo "pwrtest01" >> $pwrp_load/ld_boot_"$nname"_0999.dat
echo "Common" >> $pwrp_load/ld_boot_"$nname"_0999.dat
echo "plc_"$nname"_0999_plc" >> $pwrp_load/ld_boot_"$nname"_0999.dat
echo "VolPwrTest01c 0.254.254.203" >> $pwrp_load/ld_boot_"$nname"_0999.dat
echo "$nname 0.254.254.203 127.0.0.1 0 0 0 0 600000 0.002000 0 0 - -" > $pwrp_load/ld_node_"$nname"_0999.dat
mv $plcfile $pwrp_exe/"plc_"$nname"_0999_plc"
ip address
# Start project
rt_ini -i&
sleep 10
ps aux
export PYTHONPATH=$pwr_exe
ra_testall_c.sh
ls -l $pwrp_log
sleep 3
\ No newline at end of file
src/tools/docker/pwrtest02/Dockerfile.pwrtest02
View file @ 73a09ad5
...@@ -7,7 +7,7 @@ ARG PKG_PWR ...@@ -7,7 +7,7 @@ ARG PKG_PWR
ENV DISPLAY :1 ENV DISPLAY :1
ENV DEBIAN_FRONTEND none_interactive ENV DEBIAN_FRONTEND none_interactive
COPY ./pwrtest02/create_project.sh ./pwrtest02/configure_cvolpwrtest02.pwr_com ./pwrtest02/configure_directory.pwr_com ./pwrtest02/configure_volpwrtest02.pwr_com ./pwrtest02/pwrtest02.tar.gz ./pwrtest02/wa_testall.sh ./dummy_display_xorg.conf ./$PKG_PWR ./ COPY ./pwrtest02/create_project.sh ./pwrtest02/configure_cvolpwrtest02.pwr_com ./pwrtest02/configure_directory.pwr_com ./pwrtest02/configure_volpwrtest02.pwr_com ./pwrtest02.tar.gz ./pwrtest02/wa_testall.sh ./dummy_display_xorg.conf ./$PKG_PWR ./
RUN $INSTALL_UPDATE RUN $INSTALL_UPDATE
RUN $INSTALL_PWR RUN $INSTALL_PWR
RUN apt-get install -y python RUN apt-get install -y python
......
src/tools/docker/test_all_ubu.sh
View file @ 73a09ad5
#!/bin/bash #!/bin/bash
if [ "$1" == "" ]; then
start=1
else
start=$1
fi
if [ "$2" == "" ]; then
end=3
else
end=$2
fi
release="ubuntu:18.04" release="ubuntu:18.04"
build_rpi=1 build_rpi=1
gitrepo="-b stable http://10.255.164.96/git/x5-7-2/pwr" gitrepo="-b stable http://192.168.0.104/git/x5-7-2/pwr/.git"
install_update="apt-get update" install_update="apt-get update"
install_git="apt-get install -y git make" install_git="apt-get install -y git make"
install_build="apt-get install -y libgtk2.0-dev doxygen gcc g++ make libasound2-dev \ install_build="apt-get install -y libgtk2.0-dev doxygen gcc g++ make libasound2-dev \
libdb5.3-dev libdb5.3++-dev openjdk-11-jdk libmariadb-dev \ libdb5.3-dev libdb5.3++-dev openjdk-11-jdk libmariadb-dev \
libsqlite3-dev libhdf5-openmpi-dev librabbitmq-dev libusb-1.0.0-dev librsvg2-dev \ libsqlite3-dev libhdf5-openmpi-dev librabbitmq-dev libusb-1.0.0-dev librsvg2-dev \
libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev" libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libpython-dev"
install_rpi="apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf" install_rpi="apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf"
install_pwr="apt-get install -y libgtk2.0-0 libasound2 \ install_pwr="apt-get install -y libgtk2.0-0 libasound2 \
libdb5.3 libdb5.3++ libsqlite3-0 librsvg2-2 g++ xterm libmariadb3 \ libdb5.3 libdb5.3++ libsqlite3-0 librsvg2-2 g++ xterm libmariadb3 \
librabbitmq4 libusb-1.0-0 libhdf5-openmpi-100 librabbitmq4 \ librabbitmq4 libusb-1.0-0 libhdf5-openmpi-100 librabbitmq4 \
libgstreamer1.0-0 libgstreamer-plugins-base1.0-0 openjdk-11-jdk \ libgstreamer1.0-0 libgstreamer-plugins-base1.0-0 openjdk-11-jdk \
xterm xfonts-100dpi sudo procps" xterm xfonts-100dpi sudo procps libpython-dev"
install_pwrrt="apt-get install -y libgtk2.0-0 libasound2 \ install_pwrrt="apt-get install -y libgtk2.0-0 libasound2 \
libdb5.3 libdb5.3++ libsqlite3-0 librsvg2-2 g++ xterm libmariadb3 \ libdb5.3 libdb5.3++ libsqlite3-0 librsvg2-2 g++ xterm libmariadb3 \
librabbitmq4 libusb-1.0-0 libhdf5-openmpi-100 \ librabbitmq4 libusb-1.0-0 libhdf5-openmpi-100 \
libgstreamer1.0-0 libgstreamer-plugins-base1.0-0 \ libgstreamer1.0-0 libgstreamer-plugins-base1.0-0 \
xterm xfonts-100dpi sudo procps" xterm xfonts-100dpi sudo procps python"
jdk_dir=/usr/lib/jvm/java-11-openjdk-amd64 jdk_dir=/usr/lib/jvm/java-11-openjdk-amd64
ver="5.7.2-1" ver="5.7.2-1"
sver="57" sver="57"
...@@ -30,7 +41,10 @@ pkg_pwrrt="pwrrt_"$ver"_"$arch".deb" ...@@ -30,7 +41,10 @@ pkg_pwrrt="pwrrt_"$ver"_"$arch".deb"
pkg_pwrsev="pwrsev_"$ver"_"$arch".deb" pkg_pwrsev="pwrsev_"$ver"_"$arch".deb"
pkg_pwrrpi="pwrrpi"$sver"_"$ver"_"$arch".deb" pkg_pwrrpi="pwrrpi"$sver"_"$ver"_"$arch".deb"
docker image build -t pwr:v1 -f Dockerfile.pwr \ # Build pwr container
if [ $start -le 1 ] && [ $end -ge 1 ]; then
echo "** Building $release"
docker image build -t pwr:v1 -f build/Dockerfile.build \
--build-arg RELEASE=$release \ --build-arg RELEASE=$release \
--build-arg BUILD_RPI=$build_rpi \ --build-arg BUILD_RPI=$build_rpi \
--build-arg GITREPO="$gitrepo" \ --build-arg GITREPO="$gitrepo" \
...@@ -40,42 +54,71 @@ docker image build -t pwr:v1 -f Dockerfile.pwr \ ...@@ -40,42 +54,71 @@ docker image build -t pwr:v1 -f Dockerfile.pwr \
--build-arg INSTALL_RPI="$install_rpi" \ --build-arg INSTALL_RPI="$install_rpi" \
--build-arg JDK_DIR=$jdk_dir \ --build-arg JDK_DIR=$jdk_dir \
./ ./
docker container create --name tmp pwr:v1 docker container create --name tmp pwr:v1
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwr ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwr ./
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrdemo ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrdemo ./
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrrt ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrrt ./
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrsev ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrsev ./
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrrpi ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/pkg/$pkg_pwrrpi ./
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/project/pwrtest01/bld/common/load/pwrp_pkg_pwrtest01a_0001.tgz ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/project/pwrtest01/bld/common/load/pwrp_pkg_pwrtest01a_0001.tgz ./
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/project/pwrtest01/bld/common/load/pwrp_pkg_pwrtest01b_0001.tgz ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/project/pwrtest01/bld/common/load/pwrp_pkg_pwrtest01b_0001.tgz ./
docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/project/pwrtest01/bld/common/load/pwrp_pkg_pwrtest01c_0001.tgz ./ docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/project/pwrtest01/bld/common/load/pwrp_pkg_pwrtest01c_0001.tgz ./
docker container rm tmp docker container cp tmp:/pwr/rls/os_linux/hw_x86_64/bld/project/pwrtest02/bld/common/load/pwrtest02.tar.gz ./
docker image build -t pwrdemo:v1 -f Dockerfile.pwrdemo \ docker container rm tmp
fi
# Demo container
if [ $start -le 2 ] && [ $end -ge 2 ]; then
docker image build -t pwrdemo:v1 -f pwrdemo/Dockerfile.pwrdemo \
--build-arg RELEASE=$release \ --build-arg RELEASE=$release \
--build-arg INSTALL_UPDATE="$install_update" \ --build-arg INSTALL_UPDATE="$install_update" \
--build-arg INSTALL_PWR="$install_pwr" \ --build-arg INSTALL_PWR="$install_pwr" \
--build-arg PKG_PWR=$pkg_pwr \ --build-arg PKG_PWR=$pkg_pwr \
--build-arg PKG_PWRDEMO=$pkg_pwrdemo \ --build-arg PKG_PWRDEMO=$pkg_pwrdemo \
./ ./
#docker run pwrdemo:v1 docker run --name pwrdm pwrdemo:v1
#docker image build -t pwrtest01a:v1 -f Dockerfile.pwrtest01a \ docker container cp pwrdm:/usr/pwrp/pwrdemo$sver/bld/common/tmp/pwrdemo_status.tlog ./log/
# --build-arg RELEASE=$release \ fi
# --build-arg INSTALL_UPDATE="$install_update" \
# --build-arg INSTALL_PWRRT="$install_pwr" \ # Runtime container pwrtest01c
# --build-arg PKG_PWRRT=$pkg_pwrrt \ if [ $start -le 3 ] && [ $end -ge 3 ]; then
# ./ docker image build -t pwrtest01c:v1 -f pwrtest01c/Dockerfile.pwrtest01c \
#docker image build -t pwrtest01b:v1 -f Dockerfile.pwrtest01b \
# --build-arg RELEASE=$release \
# --build-arg INSTALL_UPDATE="$install_update" \
# --build-arg INSTALL_PWRRT="$install_pwr" \
# --build-arg PKG_PWRRT=$pkg_pwrrt \
# ./
docker image build -t pwrtest01c:v1 -f Dockerfile.pwrtest01c \
--build-arg RELEASE=$release \ --build-arg RELEASE=$release \
--build-arg INSTALL_UPDATE="$install_update" \ --build-arg INSTALL_UPDATE="$install_update" \
--build-arg INSTALL_PWRRT="$install_pwr" \ --build-arg INSTALL_PWRRT="$install_pwrrt" \
--build-arg PKG_PWRRT=$pkg_pwrrt \ --build-arg PKG_PWRRT=$pkg_pwrrt \
./ ./
#docker run --ip="172.17.0.99" pwrtest01a:v1 docker run --name pwrtc pwrtest01c:v1
#docker run --ip="172.17.0.99" pwrtest01b:v1 docker container cp pwrtc:/pwrp/common/log/plc.tlog ./log/
docker run pwrtest01c:v1 docker container cp pwrtc:/pwrp/common/log/aproc.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/cdh.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/errh.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/gdh.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/mh.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/mhappl.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/plc.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/qcom.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/qmon.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/qmonc.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/time.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/nettime.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/ccm.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/xttscript.tlog ./log/
docker container cp pwrtc:/pwrp/common/log/pwrrt.tlog ./log/
fi
# Pwrtest02 container
if [ $start -le 4 ] && [ $end -ge 4 ]; then
docker image build -t pwrtest02:v1 -f pwrtest02/Dockerfile.pwrtest02 \
--build-arg RELEASE=$release \
--build-arg INSTALL_UPDATE="$install_update" \
--build-arg INSTALL_PWR="$install_pwr" \
--build-arg PKG_PWR=$pkg_pwr \
./
docker run --name pwrt2 pwrtest02:v1
docker container cp pwrt2:/usr/pwrp/pwrtest02/bld/common/log/pwrtest02_classvolume.tlog ./log/
docker container cp pwrt2:/usr/pwrp/pwrtest02/bld/common/log/pwrtest02_rootvolume.tlog ./log/
docker container cp pwrt2:/usr/pwrp/pwrtest02/bld/common/log/ldh.tlog ./log/
docker container cp pwrt2:/usr/pwrp/pwrtest02/bld/common/log/pwrwb.tlog ./log/
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7