Skip to content
This repository was archived by the owner on Jul 8, 2022. It is now read-only.

Commit 2cc4a91

Browse files
authored
Workaround issues with Debian7-8 docker containers (#549)
* Revert "Remove Debian 7 Travis builds... (#547)" This reverts commit eaec2a0. * Update Debian 7 Travis Docker file (#546) ... Use archive.debian.org to get wheezy packages since wheezy has reached end of life and its packages have been moved to archive.debian.org Remove duplicated curl installation * Update Travis Debian 8 Docker file Work-around while waiting for upstream debian:jessie docker file to be updated after jessie-updates have been removed from Debian mirrors Remove duplicated curl installation
1 parent eaec2a0 commit 2cc4a91

File tree

4 files changed

+59
-2
lines changed

4 files changed

+59
-2
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ env:
88
- OS_TYPE=debian9 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF COVERALLS=OFF
99
- OS_TYPE=debian8 CMAKE_BUILD_TYPE=Debug SONAR_SCANNER=ON COVERALLS=ON
1010
- OS_TYPE=debian8 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF COVERALLS=OFF
11+
- OS_TYPE=debian7 CMAKE_BUILD_TYPE=RELEASE SONAR_SCANNER=OFF COVERALLS=OFF
12+
# - OS_TYPE=debian7 CMAKE_BUILD_TYPE=DEBUG
1113
# - OS_TYPE=win32
1214
# etc
1315

.travis/debian7/Dockerfile

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
FROM debian:wheezy-backports
2+
3+
ARG APP_UID=2000
4+
5+
ARG APP_GID=2000
6+
7+
MAINTAINER TANGO Controls team <tango@esrf.fr>
8+
9+
RUN echo "deb http://archive.debian.org/debian wheezy main contrib" > /etc/apt/sources.list
10+
11+
RUN echo "deb http://security.debian.org/debian-security wheezy/updates main" > /etc/apt/sources.list.d/security.list
12+
13+
RUN echo 'deb http://archive.debian.org/debian wheezy-backports main contrib' > /etc/apt/sources.list.d/backports.list
14+
15+
RUN echo "Acquire::Check-Valid-Until false;" > /etc/apt/apt.conf
16+
17+
RUN apt-get update && apt-get install -y apt-utils
18+
19+
RUN apt-get install -y build-essential
20+
21+
RUN apt-get install -y procps
22+
23+
RUN apt-get install -y wget
24+
25+
RUN apt-get install -y curl lsb-release
26+
27+
RUN wget --no-check-certificate https://cmake.org/files/v3.10/cmake-3.10.0-Linux-x86_64.sh -O /tmp/cmake-install.sh
28+
29+
RUN chmod +x /tmp/cmake-install.sh
30+
31+
RUN /tmp/cmake-install.sh --skip-license --exclude-subdir
32+
33+
RUN apt-get install -y omniidl libomniorb4-dev libcos4-dev libomnithread3-dev libzmq3-dev
34+
35+
RUN groupadd -g "$APP_GID" tango
36+
37+
RUN useradd -u "$APP_UID" -g "$APP_GID" -ms /bin/bash tango
38+
39+
ENV PKG_CONFIG_PATH=/home/tango/lib/pkgconfig
40+
41+
USER tango
42+
43+
WORKDIR /home/tango

.travis/debian7/run.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env bash
2+
3+
docker exec cpp_tango mkdir -p /home/tango/src/build
4+
5+
echo "Build cppTango:$CMAKE_BUILD_TYPE"
6+
docker exec cpp_tango cmake -H/home/tango/src -B/home/tango/src/build -DCMAKE_VERBOSE_MAKEFILE=true -DCPPZMQ_BASE=/home/tango -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE
7+
if [ $? -ne "0" ]
8+
then
9+
exit -1
10+
fi
11+
12+
docker exec cpp_tango make -C /home/tango/src/build -j 2

.travis/debian8/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ ARG APP_GID=2000
66

77
MAINTAINER TANGO Controls team <tango@esrf.fr>
88

9+
RUN sed -i '/jessie-updates/d' /etc/apt/sources.list # Now archived
10+
911
RUN apt-get update && apt-get install -y apt-utils
1012

1113
RUN apt-get install -y build-essential cmake
@@ -14,8 +16,6 @@ RUN apt-get install -y curl lsb-release
1416

1517
RUN apt-get install -y omniidl libomniorb4-dev libcos4-dev libomnithread3-dev libzmq3-dev
1618

17-
RUN apt-get update && apt-get install -y curl
18-
1919
RUN groupadd -g "$APP_GID" tango
2020

2121
RUN useradd -u "$APP_UID" -g "$APP_GID" -ms /bin/bash tango

0 commit comments

Comments
 (0)