Skip to content

Commit 6dcb979

Browse files
committed
feat: add python 3.9 + upgrade images
1 parent bc589f8 commit 6dcb979

File tree

8 files changed

+117
-117
lines changed

8 files changed

+117
-117
lines changed

‎.circleci/config.yml‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -4,84 +4,84 @@
44
# Check https://circleci.com/docs/2.0/language-python/ for more details
55
#
66
---
7-
version: 2.1
8-
executors:
9-
# here we can define an executor that will be shared across different jobs
10-
docker-executor:
11-
docker:
12-
- image: docker:stable-dind
13-
# environment:
14-
# ENV_VAR: ENV_VALUE
15-
working_directory: /root/docker
16-
resource_class: small
17-
jobs:
18-
build-docker-generic:
19-
executor: docker-executor
20-
parameters:
21-
python_version:
22-
type: string
23-
default: "3.7"
24-
docker_type:
25-
type: string
26-
default: "cpu"
27-
steps:
28-
- checkout
29-
- setup_remote_docker
30-
- run:
31-
name: Build and push image
32-
command: |
33-
docker login -u "$DOCKERHUB_LOGIN" -p "$DOCKERHUB_TOKEN"
34-
docker build ./dockerfiles/<< parameters.python_version >>/<< parameters.docker_type >>/ -t bazire/python:<< parameters.python_version >>-<< parameters.docker_type >>
35-
docker push bazire/python:<< parameters.python_version >>-<< parameters.docker_type >>
36-
workflows:
37-
version: 2
38-
docker-python-build-all:
39-
jobs:
40-
- build-docker-generic:
41-
context: dockerhub
42-
python_version: "3.7"
43-
docker_type: "cpu"
44-
filters:
45-
branches:
46-
only:
47-
- master
48-
- build-docker-generic:
49-
context: dockerhub
50-
python_version: "3.7"
51-
docker_type: "gpu"
52-
filters:
53-
branches:
54-
only:
55-
- master
56-
- build-docker-generic:
57-
context: dockerhub
58-
python_version: "3.8"
59-
docker_type: "cpu"
60-
filters:
61-
branches:
62-
only:
63-
- master
64-
- build-docker-generic:
65-
context: dockerhub
66-
python_version: "3.8"
67-
docker_type: "gpu"
68-
filters:
69-
branches:
70-
only:
71-
- master
72-
- build-docker-generic:
73-
context: dockerhub
74-
python_version: "3.9-rc"
75-
docker_type: "cpu"
76-
filters:
77-
branches:
78-
only:
79-
- master
80-
- build-docker-generic:
81-
context: dockerhub
82-
python_version: "3.9-rc"
83-
docker_type: "gpu"
84-
filters:
85-
branches:
86-
only:
87-
- master
7+
version: 2.1
8+
executors:
9+
# here we can define an executor that will be shared across different jobs
10+
docker-executor:
11+
docker:
12+
- image: docker:stable-dind
13+
# environment:
14+
# ENV_VAR: ENV_VALUE
15+
working_directory: /root/docker
16+
resource_class: small
17+
jobs:
18+
build-docker-generic:
19+
executor: docker-executor
20+
parameters:
21+
python_version:
22+
type: string
23+
default: "3.7"
24+
docker_type:
25+
type: string
26+
default: "cpu"
27+
steps:
28+
- checkout
29+
- setup_remote_docker
30+
- run:
31+
name: Build and push image
32+
command: |
33+
docker login -u "$DOCKERHUB_LOGIN" -p "$DOCKERHUB_TOKEN"
34+
docker build ./dockerfiles/<< parameters.python_version >>/<< parameters.docker_type >>/ -t bazire/python:<< parameters.python_version >>-<< parameters.docker_type >>
35+
docker push bazire/python:<< parameters.python_version >>-<< parameters.docker_type >>
36+
workflows:
37+
version: 2
38+
docker-python-build-all:
39+
jobs:
40+
- build-docker-generic:
41+
context: dockerhub
42+
python_version: "3.7"
43+
docker_type: "cpu"
44+
filters:
45+
branches:
46+
only:
47+
- master
48+
- build-docker-generic:
49+
context: dockerhub
50+
python_version: "3.7"
51+
docker_type: "gpu"
52+
filters:
53+
branches:
54+
only:
55+
- master
56+
- build-docker-generic:
57+
context: dockerhub
58+
python_version: "3.8"
59+
docker_type: "cpu"
60+
filters:
61+
branches:
62+
only:
63+
- master
64+
- build-docker-generic:
65+
context: dockerhub
66+
python_version: "3.8"
67+
docker_type: "gpu"
68+
filters:
69+
branches:
70+
only:
71+
- master
72+
- build-docker-generic:
73+
context: dockerhub
74+
python_version: "3.9-rc"
75+
docker_type: "cpu"
76+
filters:
77+
branches:
78+
only:
79+
- master
80+
- build-docker-generic:
81+
context: dockerhub
82+
python_version: "3.9-rc"
83+
docker_type: "gpu"
84+
filters:
85+
branches:
86+
only:
87+
- master

‎build-dockerfiles.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ set -e
88
# We want same base version with, or without cuda
99
# For now, it will be ubuntu 18.04
1010
declare -A config_from_type
11-
config_from_type["cpu"]='ubuntu:18.04@sha256:3235326357dfb65f1781dbc4df3b834546d8bf914e82cce58e6e6b676e23ce8f'
12-
config_from_type["gpu"]='nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04@sha256:d3f5d6e8fe105dadb55aef7c80191d6281bbd18989a05124b108b7c8a522a5ad'
11+
config_from_type["cpu"]='ubuntu:18.04@sha256:05a58ded9a2c792598e8f4aa8ffe300318eac6f294bf4f49a7abae7544918592'
12+
config_from_type["gpu"]='nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04@sha256:6a3ef37f5d0810b4ffcb0b3f2e30826377fd652418d2b3bd13e531b99ec4ec31'
1313

1414
TENSORT_RT_6_PACKAGES="libnvinfer7=7.1.3-1+cuda11.0 libnvinfer-dev=7.1.3-1+cuda11.0 libnvinfer-plugin7=7.1.3-1+cuda11.0 libnvinfer-plugin-dev=7.1.3-1+cuda11.0"
1515

‎dockerfiles/3.7/cpu/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY MANUALLY
22
# GENERATED FROM SCRIPTS
3-
FROM ubuntu:18.04@sha256:3235326357dfb65f1781dbc4df3b834546d8bf914e82cce58e6e6b676e23ce8f
3+
FROM ubuntu:18.04@sha256:05a58ded9a2c792598e8f4aa8ffe300318eac6f294bf4f49a7abae7544918592
44

55
# Avoid tzdata interactive action
66
ENV DEBIAN_FRONTEND noninteractive
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
99

1010
# Dockerfile generated fragment to install Python and Pip
1111
# Source: https://raw.githubusercontent.com/docker-library/python/master/3.7/buster/slim/Dockerfile
12-
# Python: 3.7.7
13-
# Pip: 20.1.1
12+
# Python: 3.7.9
13+
# Pip: 20.2.3
1414

1515

1616

@@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2929
&& rm -rf /var/lib/apt/lists/*
3030

3131
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
32-
ENV PYTHON_VERSION 3.7.7
32+
ENV PYTHON_VERSION 3.7.9
3333

3434
RUN set -ex \
3535
\
@@ -153,10 +153,10 @@ RUN cd /usr/local/bin \
153153
&& ln -s python3-config python-config
154154

155155
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
156-
ENV PYTHON_PIP_VERSION 20.2.2
156+
ENV PYTHON_PIP_VERSION 20.2.3
157157
# https://github.com/pypa/get-pip
158-
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/5578af97f8b2b466f4cdbebe18a3ba2d48ad1434/get-pip.py
159-
ENV PYTHON_GET_PIP_SHA256 d4d62a0850fe0c2e6325b2cc20d818c580563de5a2038f917e3cb0e25280b4d1
158+
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/fa7dc83944936bf09a0e4cb5d5ec852c0d256599/get-pip.py
159+
ENV PYTHON_GET_PIP_SHA256 6e0bb0a2c2533361d7f297ed547237caf1b7507f197835974c0dd7eba998c53c
160160

161161
RUN set -ex; \
162162
\

‎dockerfiles/3.7/gpu/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY MANUALLY
22
# GENERATED FROM SCRIPTS
3-
FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04@sha256:d3f5d6e8fe105dadb55aef7c80191d6281bbd18989a05124b108b7c8a522a5ad
3+
FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04@sha256:6a3ef37f5d0810b4ffcb0b3f2e30826377fd652418d2b3bd13e531b99ec4ec31
44

55
# Avoid tzdata interactive action
66
ENV DEBIAN_FRONTEND noninteractive
@@ -9,8 +9,8 @@ ENV DEBIAN_FRONTEND noninteractive
99

1010
# Dockerfile generated fragment to install Python and Pip
1111
# Source: https://raw.githubusercontent.com/docker-library/python/master/3.7/buster/slim/Dockerfile
12-
# Python: 3.7.7
13-
# Pip: 20.1.1
12+
# Python: 3.7.9
13+
# Pip: 20.2.3
1414

1515

1616

@@ -29,7 +29,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2929
&& rm -rf /var/lib/apt/lists/*
3030

3131
ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D
32-
ENV PYTHON_VERSION 3.7.7
32+
ENV PYTHON_VERSION 3.7.9
3333

3434
RUN set -ex \
3535
\
@@ -153,10 +153,10 @@ RUN cd /usr/local/bin \
153153
&& ln -s python3-config python-config
154154

155155
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
156-
ENV PYTHON_PIP_VERSION 20.2.2
156+
ENV PYTHON_PIP_VERSION 20.2.3
157157
# https://github.com/pypa/get-pip
158-
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/5578af97f8b2b466f4cdbebe18a3ba2d48ad1434/get-pip.py
159-
ENV PYTHON_GET_PIP_SHA256 d4d62a0850fe0c2e6325b2cc20d818c580563de5a2038f917e3cb0e25280b4d1
158+
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/fa7dc83944936bf09a0e4cb5d5ec852c0d256599/get-pip.py
159+
ENV PYTHON_GET_PIP_SHA256 6e0bb0a2c2533361d7f297ed547237caf1b7507f197835974c0dd7eba998c53c
160160

161161
RUN set -ex; \
162162
\

‎dockerfiles/3.8/cpu/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY MANUALLY
22
# GENERATED FROM SCRIPTS
3-
FROM ubuntu:18.04@sha256:3235326357dfb65f1781dbc4df3b834546d8bf914e82cce58e6e6b676e23ce8f
3+
FROM ubuntu:18.04@sha256:05a58ded9a2c792598e8f4aa8ffe300318eac6f294bf4f49a7abae7544918592
44

55
# Avoid tzdata interactive action
66
ENV DEBIAN_FRONTEND noninteractive
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND noninteractive
1010
# Dockerfile generated fragment to install Python and Pip
1111
# Source: https://raw.githubusercontent.com/docker-library/python/master/3.8/buster/slim/Dockerfile
1212
# Python: 3.8.5
13-
# Pip: 20.2.2
13+
# Pip: 20.2.3
1414

1515

1616

@@ -117,10 +117,10 @@ RUN cd /usr/local/bin \
117117
&& ln -s python3-config python-config
118118

119119
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
120-
ENV PYTHON_PIP_VERSION 20.2.2
120+
ENV PYTHON_PIP_VERSION 20.2.3
121121
# https://github.com/pypa/get-pip
122-
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/5578af97f8b2b466f4cdbebe18a3ba2d48ad1434/get-pip.py
123-
ENV PYTHON_GET_PIP_SHA256 d4d62a0850fe0c2e6325b2cc20d818c580563de5a2038f917e3cb0e25280b4d1
122+
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/fa7dc83944936bf09a0e4cb5d5ec852c0d256599/get-pip.py
123+
ENV PYTHON_GET_PIP_SHA256 6e0bb0a2c2533361d7f297ed547237caf1b7507f197835974c0dd7eba998c53c
124124

125125
RUN set -ex; \
126126
\

‎dockerfiles/3.8/gpu/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY MANUALLY
22
# GENERATED FROM SCRIPTS
3-
FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04@sha256:d3f5d6e8fe105dadb55aef7c80191d6281bbd18989a05124b108b7c8a522a5ad
3+
FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04@sha256:6a3ef37f5d0810b4ffcb0b3f2e30826377fd652418d2b3bd13e531b99ec4ec31
44

55
# Avoid tzdata interactive action
66
ENV DEBIAN_FRONTEND noninteractive
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND noninteractive
1010
# Dockerfile generated fragment to install Python and Pip
1111
# Source: https://raw.githubusercontent.com/docker-library/python/master/3.8/buster/slim/Dockerfile
1212
# Python: 3.8.5
13-
# Pip: 20.2.2
13+
# Pip: 20.2.3
1414

1515

1616

@@ -117,10 +117,10 @@ RUN cd /usr/local/bin \
117117
&& ln -s python3-config python-config
118118

119119
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
120-
ENV PYTHON_PIP_VERSION 20.2.2
120+
ENV PYTHON_PIP_VERSION 20.2.3
121121
# https://github.com/pypa/get-pip
122-
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/5578af97f8b2b466f4cdbebe18a3ba2d48ad1434/get-pip.py
123-
ENV PYTHON_GET_PIP_SHA256 d4d62a0850fe0c2e6325b2cc20d818c580563de5a2038f917e3cb0e25280b4d1
122+
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/fa7dc83944936bf09a0e4cb5d5ec852c0d256599/get-pip.py
123+
ENV PYTHON_GET_PIP_SHA256 6e0bb0a2c2533361d7f297ed547237caf1b7507f197835974c0dd7eba998c53c
124124

125125
RUN set -ex; \
126126
\

‎dockerfiles/3.9-rc/cpu/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY MANUALLY
22
# GENERATED FROM SCRIPTS
3-
FROM ubuntu:20.04@sha256:31dfb10d52ce76c5ca0aa19d10b3e6424b830729e32a89a7c6eee2cda2be67a5
3+
FROM ubuntu:18.04@sha256:05a58ded9a2c792598e8f4aa8ffe300318eac6f294bf4f49a7abae7544918592
44

55
# Avoid tzdata interactive action
66
ENV DEBIAN_FRONTEND noninteractive
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND noninteractive
1010
# Dockerfile generated fragment to install Python and Pip
1111
# Source: https://raw.githubusercontent.com/docker-library/python/master/3.9-rc/buster/slim/Dockerfile
1212
# Python: 3.9.0rc1
13-
# Pip: 20.2.2
13+
# Pip: 20.2.3
1414

1515

1616

@@ -116,10 +116,10 @@ RUN cd /usr/local/bin \
116116
&& ln -s python3-config python-config
117117

118118
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
119-
ENV PYTHON_PIP_VERSION 20.2.2
119+
ENV PYTHON_PIP_VERSION 20.2.3
120120
# https://github.com/pypa/get-pip
121-
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/5578af97f8b2b466f4cdbebe18a3ba2d48ad1434/get-pip.py
122-
ENV PYTHON_GET_PIP_SHA256 d4d62a0850fe0c2e6325b2cc20d818c580563de5a2038f917e3cb0e25280b4d1
121+
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/fa7dc83944936bf09a0e4cb5d5ec852c0d256599/get-pip.py
122+
ENV PYTHON_GET_PIP_SHA256 6e0bb0a2c2533361d7f297ed547237caf1b7507f197835974c0dd7eba998c53c
123123

124124
RUN set -ex; \
125125
\

‎dockerfiles/3.9-rc/gpu/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# DO NOT MODIFY MANUALLY
22
# GENERATED FROM SCRIPTS
3-
FROM nvidia/cuda:11.0-devel-ubuntu20.04@sha256:0fe0406ec4e456ae682226751434bdd7e9b729a03067d795f9b34c978772b515
3+
FROM nvidia/cuda:10.2-cudnn7-devel-ubuntu18.04@sha256:6a3ef37f5d0810b4ffcb0b3f2e30826377fd652418d2b3bd13e531b99ec4ec31
44

55
# Avoid tzdata interactive action
66
ENV DEBIAN_FRONTEND noninteractive
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND noninteractive
1010
# Dockerfile generated fragment to install Python and Pip
1111
# Source: https://raw.githubusercontent.com/docker-library/python/master/3.9-rc/buster/slim/Dockerfile
1212
# Python: 3.9.0rc1
13-
# Pip: 20.2.2
13+
# Pip: 20.2.3
1414

1515

1616

@@ -116,10 +116,10 @@ RUN cd /usr/local/bin \
116116
&& ln -s python3-config python-config
117117

118118
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
119-
ENV PYTHON_PIP_VERSION 20.2.2
119+
ENV PYTHON_PIP_VERSION 20.2.3
120120
# https://github.com/pypa/get-pip
121-
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/5578af97f8b2b466f4cdbebe18a3ba2d48ad1434/get-pip.py
122-
ENV PYTHON_GET_PIP_SHA256 d4d62a0850fe0c2e6325b2cc20d818c580563de5a2038f917e3cb0e25280b4d1
121+
ENV PYTHON_GET_PIP_URL https://github.com/pypa/get-pip/raw/fa7dc83944936bf09a0e4cb5d5ec852c0d256599/get-pip.py
122+
ENV PYTHON_GET_PIP_SHA256 6e0bb0a2c2533361d7f297ed547237caf1b7507f197835974c0dd7eba998c53c
123123

124124
RUN set -ex; \
125125
\

0 commit comments

Comments
 (0)