Browse Source

Making Python version uniform across all airship components.

Change-Id: I53febd3da36812e0bce0be5a80e57dca0c7804c3
changes/32/611932/2
j330k 3 years ago
committed by Jagan Kavva
parent
commit
c90e017bea
  1. 2
      Makefile
  2. 2
      images/shipyard/Dockerfile
  3. 1
      src/bin/shipyard_airflow/setup.py
  4. 1
      src/bin/shipyard_client/setup.py

2
Makefile

@ -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

@ -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

@ -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

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