aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Schmidt <stefan@osg.samsung.com>2018-01-09 22:14:50 +0100
committerStefan Schmidt <stefan@osg.samsung.com>2018-01-09 22:16:42 +0100
commitdba4d1d9abcb5d3f781dd312b4f26e4dafeb9403 (patch)
tree85d421958082a5eb74d604d29d39531ea288886f
parenttravis: add misc and wayland build options to build matrix (diff)
downloadefl-devs/stefan/travis-docker-test.tar.gz
ci: keep dockerfiles in sync with repo used for building on docker hubdevs/stefan/travis-docker-test
We have an extra repo for these files on our github project to allow docker hub building these images automatically for us to be ready when CI kicks in. We still want to have them here as well to aid developer using them for testing.
-rw-r--r--.ci/dockerfiles/Dockerfile-Archlinux (renamed from .ci/Dockerfile-Archlinux)6
-rw-r--r--.ci/dockerfiles/Dockerfile-Debian91 (renamed from .ci/Dockerfile-Debian91)6
-rw-r--r--.ci/dockerfiles/Dockerfile-Fedora26 (renamed from .ci/Dockerfile-Fedora26)6
-rw-r--r--.ci/dockerfiles/Dockerfile-Fedora27 (renamed from .ci/Dockerfile-Fedora27)6
-rw-r--r--.ci/dockerfiles/Dockerfile-Opensuse4237
-rw-r--r--.ci/dockerfiles/Dockerfile-Ubuntu1704 (renamed from .ci/Dockerfile-Ubuntu1704)6
-rw-r--r--.ci/dockerfiles/Dockerfile-Ubuntu1710 (renamed from .ci/Dockerfile-Ubuntu1710)6
7 files changed, 7 insertions, 36 deletions
diff --git a/.ci/Dockerfile-Archlinux b/.ci/dockerfiles/Dockerfile-Archlinux
index a94dc2a5fb..2b335e31c1 100644
--- a/.ci/Dockerfile-Archlinux
+++ b/.ci/dockerfiles/Dockerfile-Archlinux
@@ -10,9 +10,3 @@ RUN pacman -S --noconfirm git bullet libjpeg-turbo gst-plugins-base \
libspectre libraw librsvg wayland-protocols \
git ninja clang gcc pkgconfig check autoconf make base-devel \
mesa poppler
-
-# Build
-RUN mkdir -p /src/
-WORKDIR /src/
-COPY . /src/
-RUN .ci/ci-linux-build.sh
diff --git a/.ci/Dockerfile-Debian91 b/.ci/dockerfiles/Dockerfile-Debian91
index 10d8a1e8b0..a8d2ea20af 100644
--- a/.ci/Dockerfile-Debian91
+++ b/.ci/dockerfiles/Dockerfile-Debian91
@@ -3,9 +3,3 @@ FROM debian:9.1
# Install
RUN apt-get update -y
RUN apt-get install -y make gcc bison flex gawk subversion automake autoconf doxygen check autotools-dev autoconf-archive autopoint libtool gettext libpam0g-dev libfreetype6-dev libpng-dev zlib1g-dev libjpeg-dev libdbus-1-dev luajit libluajit-5.1-dev libx11-dev libxcursor-dev libxrender-dev libxrandr-dev libxfixes-dev libxdamage-dev libxcomposite-dev libxss-dev libxext-dev libxinerama-dev libxkbfile-dev libxtst-dev libxcb1-dev libxcb-shape0-dev libxcb-keysyms1-dev libpulse-dev libsndfile1-dev libudev-dev libblkid-dev libmount-dev libgstreamer1.0-dev libtiff5-dev libgif-dev curl libssl-dev libspectre-dev libpoppler-dev librsvg2-dev libraw-dev libxinerama-dev git libfribidi-dev libcogl-gles2-dev libbullet-dev libgstreamer-plugins-base1.0-dev libvlc-dev libpoppler-cpp-dev libsystemd-dev systemd libsystemd0
-
-# Build
-RUN mkdir -p /src/
-WORKDIR /src/
-COPY . /src/
-RUN .ci/ci-linux-build.sh
diff --git a/.ci/Dockerfile-Fedora26 b/.ci/dockerfiles/Dockerfile-Fedora26
index 50afa45af1..6649c937f1 100644
--- a/.ci/Dockerfile-Fedora26
+++ b/.ci/dockerfiles/Dockerfile-Fedora26
@@ -3,9 +3,3 @@ FROM fedora:26
# Install
RUN dnf update --assumeyes
RUN dnf install --assumeyes bullet-devel libpng-devel libjpeg-turbo-devel gstreamer1-devel gstreamer1-plugins-base-devel zlib-devel luajit-devel libtiff-devel openssl-devel libcurl-devel dbus-devel glibc-devel fontconfig-devel freetype-devel fribidi-devel pulseaudio-libs-devel libsndfile-devel libX11-devel libXau-devel libXcomposite-devel libXdamage-devel libXdmcp-devel libXext-devel libXfixes-devel libXinerama-devel libXrandr-devel libXrender-devel libXScrnSaver-devel libXtst-devel libXcursor-devel libXp-devel libXi-devel mesa-libGL-devel giflib-devel libmount-devel libblkid-devel systemd-devel poppler-cpp-devel poppler-devel LibRaw-devel libspectre-devel librsvg2-devel autoconf automake gcc gcc-c++ gettext-devel findutils tar xz libtool make
-
-# Build
-RUN mkdir -p /src/
-WORKDIR /src/
-COPY . /src/
-RUN .ci/ci-linux-build.sh
diff --git a/.ci/Dockerfile-Fedora27 b/.ci/dockerfiles/Dockerfile-Fedora27
index eb7689a9ca..e0d4b8c4fe 100644
--- a/.ci/Dockerfile-Fedora27
+++ b/.ci/dockerfiles/Dockerfile-Fedora27
@@ -9,9 +9,3 @@ RUN dnf install --assumeyes wayland-protocols-devel libwayland-client libwayland
# Install misc build dependencies
RUN dnf install --assumeyes lz4-devel harfbuzz-devel libXpresent-devel libwebp-devel hyphen-devel lua-devel
-
-# Build
-RUN mkdir -p /src/
-WORKDIR /src/
-COPY . /src/
-RUN .ci/ci-linux-build.sh
diff --git a/.ci/dockerfiles/Dockerfile-Opensuse423 b/.ci/dockerfiles/Dockerfile-Opensuse423
new file mode 100644
index 0000000000..697766d659
--- /dev/null
+++ b/.ci/dockerfiles/Dockerfile-Opensuse423
@@ -0,0 +1,7 @@
+FROM opensuse:42.3
+
+# Install
+RUN zypper --non-interactive update
+RUN zypper --non-interactive install -t pattern devel_basis
+RUN zypper --non-interactive in -d efl
+RUN zypper --non-interactive install gcc-c++ gettext-devel doxygen check libcheck0 check-devel libopenssl-devel systemd-devel libjpeg-devel glib2-devel gstreamer-devel gstreamer-plugins-base-devel luajit-devel freetype2-devel fontconfig-devel fribidi-devel libpng-devel libtiff-devel libcurl-devel libsndfile-devel libX11-devel libXau-devel libXcomposite-devel libXdamage-devel libXdmcp-devel libXext-devel libXfixes-devel libXinerama-devel libXrandr-devel libXrender-devel libXScrnSaver-devel libXtst-devel libXcursor-devel libXp-devel libXi-devel Mesa-libGL-devel giflib-devel libmount-devel libblkid-devel poppler-devel libraw-devel libspectre-devel librsvg2-devel gettext-devel libbullet-devel libudev-devel dbus-1-devel libpulse-devel
diff --git a/.ci/Dockerfile-Ubuntu1704 b/.ci/dockerfiles/Dockerfile-Ubuntu1704
index 426ac9ec6f..ecec07e07c 100644
--- a/.ci/Dockerfile-Ubuntu1704
+++ b/.ci/dockerfiles/Dockerfile-Ubuntu1704
@@ -3,9 +3,3 @@ FROM ubuntu:17.04
# Install
RUN apt-get update -y
RUN apt-get install -y build-essential autoconf automake autopoint doxygen check luajit libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libluajit-5.1-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libvlc-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxine2-dev libxss-dev linux-tools-common libcurl4-openssl-dev
-
-# Build
-RUN mkdir -p /src/
-WORKDIR /src/
-COPY . /src/
-RUN .ci/ci-linux-build.sh
diff --git a/.ci/Dockerfile-Ubuntu1710 b/.ci/dockerfiles/Dockerfile-Ubuntu1710
index 2cdf1093ff..8a7e7cae53 100644
--- a/.ci/Dockerfile-Ubuntu1710
+++ b/.ci/dockerfiles/Dockerfile-Ubuntu1710
@@ -3,9 +3,3 @@ FROM ubuntu:17.10
# Install
RUN apt-get update -y
RUN apt-get install -y build-essential autoconf automake autopoint doxygen check luajit libharfbuzz-dev libpng-dev libudev-dev libwebp-dev libssl-dev libluajit-5.1-dev libfribidi-dev libcogl-gles2-dev libgif-dev libtiff5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libdbus-1-dev libmount-dev libblkid-dev libpulse-dev libxrandr-dev libxtst-dev libxcursor-dev libxcomposite-dev libxinerama-dev libxkbfile-dev libbullet-dev libvlc-dev libsndfile1-dev libraw-dev libspectre-dev libpoppler-cpp-dev libpam0g-dev liblz4-dev faenza-icon-theme gettext git imagemagick libasound2-dev libbluetooth-dev libfontconfig1-dev libfreetype6-dev libibus-1.0-dev libiconv-hook-dev libjpeg-dev libjpeg-turbo8-dev libpoppler-dev libpoppler-private-dev libproxy-dev librsvg2-dev libscim-dev libsystemd-dev libtool libudisks2-dev libunibreak-dev libxcb-keysyms1-dev libxine2-dev libxss-dev linux-tools-common libcurl4-openssl-dev systemd
-
-# Build
-RUN mkdir -p /src/
-WORKDIR /src/
-COPY . /src/
-RUN .ci/ci-linux-build.sh