airship/armada
Code Issues Proposed changes

Making Python version uniform across all airship components.

Browse Source 
Change-Id: Ia6ee58fd11a83151b1011b2a21779f8a17edad0c
This commit is contained in:
j330k 2018-10-19 12:57:10 -05:00 committed by Jagan Mohan Kavva
parent f30c68e627
commit fb88969c91
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -1,4 +1,4 @@
ARG FROM=python:3.5
ARG FROM=python:3.6
FROM ${FROM}
LABEL org.opencontainers.image.authors='airship-discuss@lists.airshipit.org, irc://#airshipit@freenode'

2
Makefile
View File

@ -26,7 +26,7 @@ COMMIT ?= commit-id
PYTHON = python3
CHARTS := $(patsubst charts/%/.,%,$(wildcard charts/*/.))
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
PYTHON_BASE_IMAGE ?= python:3.5
PYTHON_BASE_IMAGE ?= python:3.6
# VERSION INFO
GIT_COMMIT = $(shell git rev-parse HEAD)

1
setup.cfg
View File

@ -13,6 +13,7 @@ classifier =
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
[files]
packages =