Skip to content
Snippets Groups Projects
Commit 484018d5 authored by apurvapatkar's avatar apurvapatkar
Browse files

Update the dockerfile to include the latest released versions of the HDB++ packages.

parent 4bfd3c79
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,14 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre ...@@ -23,7 +23,14 @@ RUN echo "deb http://deb.debian.org/debian buster-backports main contrib non-fre
libmariadb-dev-compat libmariadb-dev \ libmariadb-dev-compat libmariadb-dev \
libmariadbclient-dev libmariadbclient-dev
RUN git clone -b v1.0.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp.git # RUN echo "******************** TESTING *********************"
# RUN ls
# RUN cd /usr/local/include \
# && ls
# RUN cd /usr/local/lib \
# && ls
RUN git clone -b v2.0.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp.git
RUN cd libhdbpp \ RUN cd libhdbpp \
&& mkdir build \ && mkdir build \
...@@ -52,12 +59,12 @@ RUN cd libhdbpp/build \ ...@@ -52,12 +59,12 @@ RUN cd libhdbpp/build \
--requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \ --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
make install make install
RUN git clone -b v1.1.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp-mysql.git RUN git clone -b v1.2.0 --depth 1 https://github.com/tango-controls-hdbpp/libhdbpp-mysql.git
RUN cd libhdbpp-mysql \ RUN cd libhdbpp-mysql \
&& make TANGO_INC=/usr/local/include/tango && make TANGO_INC=/usr/local/include/tango
RUN cd libhdbpp-mysql \ RUN cd libhdbpp-mysql/build \
&& checkinstall \ && checkinstall \
--install=yes \ --install=yes \
--fstrans=no \ --fstrans=no \
...@@ -72,13 +79,13 @@ RUN cd libhdbpp-mysql \ ...@@ -72,13 +79,13 @@ RUN cd libhdbpp-mysql \
--stripso \ --stripso \
--maintainer="tango" \ --maintainer="tango" \
--pkgarch=$(dpkg --print-architecture) \ --pkgarch=$(dpkg --print-architecture) \
--pkgversion="1.1.0" \ --pkgversion="1.2.0" \
--pkgrelease="SNAPSHOT" \ --pkgrelease="SNAPSHOT" \
--pkgname="libhdbpp-mysql" \ --pkgname="libhdbpp-mysql" \
--requires="libmariadbclient-dev" \ --requires="libmariadbclient-dev" \
make install make install
RUN git clone -b v1.0.1 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-es.git RUN git clone -b v2.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-es.git
RUN cd hdbpp-es \ RUN cd hdbpp-es \
&& make TANGO_INC=/usr/local/include/tango && make TANGO_INC=/usr/local/include/tango
...@@ -98,13 +105,13 @@ RUN cd hdbpp-es \ ...@@ -98,13 +105,13 @@ RUN cd hdbpp-es \
--stripso \ --stripso \
--maintainer="tango" \ --maintainer="tango" \
--pkgarch=$(dpkg --print-architecture) \ --pkgarch=$(dpkg --print-architecture) \
--pkgversion="1.0.1" \ --pkgversion="2.0.0" \
--pkgrelease="SNAPSHOT" \ --pkgrelease="SNAPSHOT" \
--pkgname="hdbpp-es" \ --pkgname="hdbpp-es" \
--requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \ --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
make install make install
RUN git clone -b v1.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-cm.git RUN git clone -b v2.0.0 --depth 1 https://github.com/tango-controls-hdbpp/hdbpp-cm.git
RUN cd hdbpp-cm \ RUN cd hdbpp-cm \
&& make TANGO_INC=/usr/local/include/tango && make TANGO_INC=/usr/local/include/tango
...@@ -124,7 +131,7 @@ RUN cd hdbpp-cm \ ...@@ -124,7 +131,7 @@ RUN cd hdbpp-cm \
--stripso \ --stripso \
--maintainer="tango" \ --maintainer="tango" \
--pkgarch=$(dpkg --print-architecture) \ --pkgarch=$(dpkg --print-architecture) \
--pkgversion="1.0.0" \ --pkgversion="2.0.0" \
--pkgrelease="SNAPSHOT" \ --pkgrelease="SNAPSHOT" \
--pkgname="hdbpp-cm" \ --pkgname="hdbpp-cm" \
--requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \ --requires="libzmq5,libomniorb4-2,libcos4-2,libomnithread4" \
...@@ -137,9 +144,9 @@ RUN apt-get update && \ ...@@ -137,9 +144,9 @@ RUN apt-get update && \
apt-get clean apt-get clean
RUN dpkg -i /libhdbpp/build/libhdbpp_1.0.0-SNAPSHOT_amd64.deb RUN dpkg -i /libhdbpp/build/libhdbpp_1.0.0-SNAPSHOT_amd64.deb
RUN dpkg -i /libhdbpp-mysql/libhdbpp-mysql_1.1.0-SNAPSHOT_amd64.deb RUN dpkg -i /libhdbpp-mysql/libhdbpp-mysql_1.2.0-SNAPSHOT_amd64.deb
RUN dpkg -i /hdbpp-es/hdbpp-es_1.0.1-SNAPSHOT_amd64.deb RUN dpkg -i /hdbpp-es/hdbpp-es_2.0.0-SNAPSHOT_amd64.deb
RUN dpkg -i /hdbpp-cm/hdbpp-cm_1.0.0-SNAPSHOT_amd64.deb RUN dpkg -i /hdbpp-cm/hdbpp-cm_2.0.0-SNAPSHOT_amd64.deb
RUN ldconfig RUN ldconfig
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment