summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-22 17:17:47 +0000
committerGerrit Code Review <review@openstack.org>2018-10-22 17:17:47 +0000
commit1c8fd5ce4f793aaf12a97eb4684a6d5a8a5d7661 (patch)
tree6e7d9236711f06cc46ae41f6c476314677f6a29b
parentae2a061c3b8b1776f6fdebd499b8f3f5444198d3 (diff)
parentc90e017beaeb98539e66cd1731fac58630a19ab8 (diff)
Merge "Making Python version uniform across all airship components."
-rw-r--r--Makefile2
-rw-r--r--images/shipyard/Dockerfile2
-rw-r--r--src/bin/shipyard_airflow/setup.py1
-rw-r--r--src/bin/shipyard_client/setup.py1
4 files changed, 4 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index afddfb9..7428581 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ PROXY ?= http://proxy.foo.com:8000
29NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local 29NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
30USE_PROXY ?= false 30USE_PROXY ?= false
31 31
32PYTHON_BASE_IMAGE ?= python:3.5 32PYTHON_BASE_IMAGE ?= python:3.6
33UBUNTU_BASE_IMAGE ?= ubuntu:16.04 33UBUNTU_BASE_IMAGE ?= ubuntu:16.04
34 34
35IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG} 35IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG}
diff --git a/images/shipyard/Dockerfile b/images/shipyard/Dockerfile
index ae37ef7..726496d 100644
--- a/images/shipyard/Dockerfile
+++ b/images/shipyard/Dockerfile
@@ -12,7 +12,7 @@
12# See the License for the specific language governing permissions and 12# See the License for the specific language governing permissions and
13# limitations under the License. 13# limitations under the License.
14 14
15ARG FROM=python:3.5 15ARG FROM=python:3.6
16FROM ${FROM} 16FROM ${FROM}
17 17
18LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode' 18LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'
diff --git a/src/bin/shipyard_airflow/setup.py b/src/bin/shipyard_airflow/setup.py
index a2c4866..3042db2 100644
--- a/src/bin/shipyard_airflow/setup.py
+++ b/src/bin/shipyard_airflow/setup.py
@@ -39,5 +39,6 @@ setuptools.setup(
39 'Programming Language :: Python', 39 'Programming Language :: Python',
40 'Programming Language :: Python :: 3', 40 'Programming Language :: Python :: 3',
41 'Programming Language :: Python :: 3.5', 41 'Programming Language :: Python :: 3.5',
42 'Programming Language :: Python :: 3.6',
42 ], 43 ],
43) 44)
diff --git a/src/bin/shipyard_client/setup.py b/src/bin/shipyard_client/setup.py
index 3b55a15..0981f64 100644
--- a/src/bin/shipyard_client/setup.py
+++ b/src/bin/shipyard_client/setup.py
@@ -34,5 +34,6 @@ setuptools.setup(
34 'Programming Language :: Python', 34 'Programming Language :: Python',
35 'Programming Language :: Python :: 3', 35 'Programming Language :: Python :: 3',
36 'Programming Language :: Python :: 3.5', 36 'Programming Language :: Python :: 3.5',
37 'Programming Language :: Python :: 3.6',
37 ], 38 ],
38) 39)