airship/shipyard
Code Issues Proposed changes

Merge "Making Python version uniform across all airship components."

Browse Source
This commit is contained in:
Zuul 2018-10-22 17:17:47 +00:00 committed by Gerrit Code Review
commit 1c8fd5ce4f
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -29,7 +29,7 @@ PROXY ?= http://proxy.foo.com:8000
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= false
PYTHON_BASE_IMAGE ?= python:3.5
PYTHON_BASE_IMAGE ?= python:3.6
UBUNTU_BASE_IMAGE ?= ubuntu:16.04
IMAGE:=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$(IMAGE_NAME):${IMAGE_TAG}

2
images/shipyard/Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
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'

1
src/bin/shipyard_airflow/setup.py
View File

@ -39,5 +39,6 @@ setuptools.setup(
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
)

1
src/bin/shipyard_client/setup.py
View File

@ -34,5 +34,6 @@ setuptools.setup(
'Programming Language :: Python',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
],
)