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

List:       kde-commits
Subject:    [sysadmin/ci-tooling] system-images/ubuntu-1604-craft: Provide Python 3.6 to keep Craft happy
From:       Ben Cooksley <null () kde ! org>
Date:       2018-09-01 3:53:28
Message-ID: E1fvwyW-0003iM-Oz () code ! kde ! org
[Download RAW message or body]

Git commit 17b5d1d28abacfb5b13fa22a62de8a462f7cd0b2 by Ben Cooksley.
Committed on 01/09/2018 at 03:53.
Pushed by bcooksley into branch 'master'.

Provide Python 3.6 to keep Craft happy

M  +3    -0    system-images/ubuntu-1604-craft/Dockerfile

https://commits.kde.org/sysadmin/ci-tooling/17b5d1d28abacfb5b13fa22a62de8a4=
62f7cd0b2

diff --git a/system-images/ubuntu-1604-craft/Dockerfile b/system-images/ubu=
ntu-1604-craft/Dockerfile
index 7104c23..83bf3e9 100644
--- a/system-images/ubuntu-1604-craft/Dockerfile
+++ b/system-images/ubuntu-1604-craft/Dockerfile
@@ -10,6 +10,9 @@ USER root
 RUN apt-get update && apt-get install -y software-properties-common python=
-software-properties && add-apt-repository -y ppa:openjdk-r/ppa
 RUN apt-get update && apt-get upgrade -y && apt-get install -y openssh-ser=
ver openjdk-8-jre-headless
 =

+# Craft and Craftmaster need Python 3.6 at a minimum
+RUN add-apt-repository ppa:deadsnakes/ppa && apt-get update && apt-get ins=
tall python3.6
+
 # Now install the general dependencies we need for builds
 RUN apt-get install -y \
   # General requirements for building KDE software
[prev in list] [next in list] [prev in thread] [next in thread]