summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2020-03-26 08:48:20 -0500
committerMonty Taylor <mordred@inaugust.com>2020-03-26 08:48:20 -0500
commit8efb319819534545a63c57e98ef8446becdb94c2 (patch)
treeab4b60cbf88197735dbce1b7b0751b1b600a29c1
parent97d027caecdb977779ff130bb9ee2b3204c5646c (diff)
downloadpython-openstackclient-8efb319819534545a63c57e98ef8446becdb94c2.tar.gz
Be explicit about python version in image
python-base has versions available now, defaulting to 3.7. Update our config to 3.7 to be explicit about what we're using. This will let us update the version as we feel like. Change-Id: I40ffde91808a8bb95479697b9127dba16de8a8cd
-rw-r--r--.zuul.yaml8
-rw-r--r--Dockerfile4
2 files changed, 6 insertions, 6 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 7a7e264c..4901a1ed 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -174,8 +174,8 @@
description: Build Docker images.
allowed-projects: openstack/python-openstackclient
requires:
- - python-builder-container-image
- - python-base-container-image
+ - python-builder-3.7-container-image
+ - python-base-3.7-container-image
provides: osc-container-image
vars: &osc_image_vars
docker_images:
@@ -188,8 +188,8 @@
description: Build Docker images and upload to Docker Hub.
allowed-projects: openstack/python-openstackclient
requires:
- - python-builder-container-image
- - python-base-container-image
+ - python-builder-3.7-container-image
+ - python-base-3.7-container-image
provides: osc-container-image
secrets:
- name: docker_credentials
diff --git a/Dockerfile b/Dockerfile
index 9ff8084c..ca60bb0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM docker.io/opendevorg/python-builder as builder
+FROM docker.io/opendevorg/python-builder:3.7 as builder
COPY . /tmp/src
RUN assemble
-FROM docker.io/opendevorg/python-base
+FROM docker.io/opendevorg/python-base:3.7
COPY --from=builder /output/ /output
RUN /output/install-from-bindep