[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [websites/build-kde-org/sok-work] /: Artikulate needs qt-gstreamer.
From:       Scarlett Clark <scarlett () scarlettgatelyclark ! com>
Date:       2015-03-31 23:21:02
Message-ID: E1Yd5Sw-00031i-DD () scm ! kde ! org
[Download RAW message or body]

Git commit 7d9f4870053a11e9aab9a0e847dbdbb2cf935a3a by Scarlett Clark.
Committed on 31/03/2015 at 23:20.
Pushed by scarlettclark into branch 'sok-work'.

Artikulate needs qt-gstreamer.

M  +3    -0    config/base/kf5-qt5
M  +5    -5    docker/ubuntu-slave/Dockerfile

http://commits.kde.org/websites/build-kde-org/7d9f4870053a11e9aab9a0e847dbd=
bb2cf935a3a

diff --git a/config/base/kf5-qt5 b/config/base/kf5-qt5
index 725f28b..b63fa66 100644
--- a/config/base/kf5-qt5
+++ b/config/base/kf5-qt5
@@ -24,6 +24,9 @@ kde/*: general/kdesupport-svn
 kde/workspace/plasma-workspace: general/libdbusmenu-qt
 kde/workspace/kio-extras: general/libssh
 =

+# KDE kdeedu
+kde/kdeedu/artikulate general/qt-gstreamer
+
 # Extragear Office
 extragear/office/tellico: general/kdesupport-svn
 extragear/office/skrooge: general/grantlee
diff --git a/docker/ubuntu-slave/Dockerfile b/docker/ubuntu-slave/Dockerfile
index 34b58ac..0f0480b 100644
--- a/docker/ubuntu-slave/Dockerfile
+++ b/docker/ubuntu-slave/Dockerfile
@@ -1,19 +1,19 @@
 #Please update the address to the private registry
-FROM 192.168.0.7:5000/ubuntu-core:14.10
+FROM ubuntu:14.10
 MAINTAINER Scarlett Clark <sgclark@kubuntu.org>
 =

 #Install Essentials up to qt5
-RUN apt-get update && apt-get -y install openssh-server sudo wget build-es=
sential openjdk-6-jre-headless git python-lxml xvfb openbox dbus-x11 psmisc=
 doxygen bzr cppcheck gperf bison ruby flex libpolkit-agent-1-dev libpolkit=
-backend-1-dev libpolkit-gobject-1-dev libxslt1-dev docbook-xml docbook-xsl=
 libgcrypt-dev libboost1.55-dev gcovr libnm-glib-dev libarchive libnm-util-=
dev libopenal-dev  libsndfile1-dev libexiv2-dev libattr1-dev libxapian-dev =
&& apt-get -y build-dep qtbase5-dev
+RUN apt-get update && apt-get -y install openssh-server sudo wget build-es=
sential openjdk-6-jre-headless git python-lxml xvfb openbox dbus-x11 psmisc=
 doxygen bzr cppcheck gperf bison ruby flex libpolkit-agent-1-dev libpolkit=
-backend-1-dev libpolkit-gobject-1-dev libxslt1-dev docbook-xml docbook-xsl=
 libgcrypt-dev libboost1.55-dev gcovr libnm-glib-dev libnm-util-dev libopen=
al-dev  libsndfile1-dev libexiv2-dev libattr1-dev libxapian-dev xsltproc li=
bgpgme11-dev libsasl2-dev libdmtx-dev libqrencode-dev libldap2-dev =

+libical-dev && apt-get -y build-dep qtbase5-dev
 =

 #SSH I have master and slave on the same host so I had to get creative wit=
h ssh ports. update as needed.
-EXPOSE 222
+EXPOSE 22
 =

 RUN mkdir -p /var/run/sshd
-RUN sed 's/Port\ 22/Port\ 222/' -i /etc/ssh/sshd_config
 RUN /usr/sbin/sshd
 =

 RUN useradd -m -d /home/jenkins jenkins
-RUN echo 'jenkins:1234' | chpasswd # Please update this before build.
+RUN echo 'jenkins:KkZ5#aB3!' | chpasswd # Please update this before build.
 RUN su - jenkins -c "mkdir -p /home/jenkins/.ssh"
 =

 #This keys need to be in path (aka generated on your host and placed in bu=
ild folder)
[prev in list] [next in list] [prev in thread] [next in thread]