Skip to content

Commit 30a1bec

Browse files
feat: Update py38 base image to use and more
Also update, - `pip` to 20.1.1 - `pre-commit` to 2.4.0 - `tox` to 3.15.1 - `virtualenv` to 20.0.21 And add, - `g++` 8.3.0 - `gettext` 0.19.8.1 - `rsync` 3.1.3 Fixes: #2 Fixes: #4
1 parent 6bb1e05 commit 30a1bec

4 files changed

Lines changed: 42 additions & 23 deletions

File tree

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# 3.3.0 (2020-05-25)
2+
3+
- Update `py38` image to Python 3.8.3
4+
- Update `py37` image to Python 3.7.7
5+
- Update pip to 20.1.1
6+
- Update pre-commit to 2.4.0
7+
- Update tox to 3.15.1
8+
- Update virtualenv to 20.0.21
9+
- Add [g++](https://gcc.gnu.org) 8.3.0
10+
- Add [rsync](https://rsync.samba.net) 3.1.3
11+
- Add [gettext](https://www.gnu.org/software/gettext/) 0.19.8.1
12+
113
# 3.2.0 (2020-03-01)
214

315
- Update `py38` image to Python 3.8.2

Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
FROM python:3.8.2-slim-buster
1+
FROM python:3.8.3-slim-buster
22

33
LABEL maintainer="Igor Davydenko <iam@igordavydenko.com>"
44
LABEL description="Add poetry, pre-commit, and other dev-tools to official Python slim Docker image."
55

6-
RUN apt update -qq && apt upgrade -y && apt install -y curl gcc git locales locales-all make nano openssh-client && apt autoremove -y
6+
RUN apt update -qq \
7+
&& apt upgrade -y \
8+
&& apt install -y curl gcc g++ gettext git locales locales-all make nano openssh-client rsync \
9+
&& apt autoremove -y
710

811
ENV PATH="/root/.local/bin:/root/.poetry/bin:${PATH}"
912

10-
RUN pip install pip==20.0.2 pre-commit==2.1.1 tox==3.14.5 virtualenv==20.0.7
13+
RUN pip install pip==20.1.1 pre-commit==2.4.0 tox==3.15.1 virtualenv==20.0.21
1114

1215
ENV POETRY_VERSION=1.0.5
1316
RUN curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python

Makefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@
22

33
DOCKER ?= docker
44
IMAGE ?= playpauseandstop/docker-python
5-
VERSION ?= latest
5+
TAG ?= latest
66

77
all: build
88

99
build: .build
1010
.build: Dockerfile
11-
$(DOCKER) build -t $(IMAGE):$(VERSION) .
11+
$(DOCKER) build -t $(IMAGE):$(TAG) .
1212
touch $@
1313

14-
deploy:
15-
ifeq ($(VERSION),)
16-
$(DOCKER) push $(IMAGE):$(VERSION)
17-
else
18-
$(DOCKER) push $(IMAGE)
19-
endif
14+
deploy: build
15+
$(DOCKER) push $(IMAGE):$(TAG)
2016

2117
run: build
22-
$(DOCKER) run --rm -it $(IMAGE) $(CMD)
18+
$(DOCKER) run --rm -it $(IMAGE):$(TAG) $(ARGS)

README.md

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,21 @@ FROM playpauseandstop/docker-python:3.2.0
1414

1515
### Included dev-tools
1616

17-
- [pip](https://pip.pypa.io) 20.0.2
17+
- [pip](https://pip.pypa.io) 20.1.1
1818
- [poetry](https://poetry.eustace.io) 1.0.5
19-
- [pre-commit](https://pre-commit.com) 2.1.1
20-
- [tox](https://tox.readthedocs.io/) 3.14.5
21-
- [virtualenv](https://virtualenv.pypa.io) 20.0.7
19+
- [pre-commit](https://pre-commit.com) 2.4.0
20+
- [tox](https://tox.readthedocs.io/) 3.15.1
21+
- [virtualenv](https://virtualenv.pypa.io) 20.0.21
2222
- [curl](https://curl.haxx.se) 7.64.0
2323
- [git](https://git-scm.com) 2.20.1
2424
- [locales](https://packages.debian.org/stretch/locales) &
2525
[locales-all](https://packages.debian.org/stretch/locales-all)
26-
- [gcc](https://gcc.gnu.org) 8.3.0
26+
- [gcc & g++](https://gcc.gnu.org) 8.3.0
2727
- [make](https://www.gnu.org/software/make) 4.2.1
2828
- [nano](https://www.nano-editor.org) 3.2
29-
- [openssh-client](https://packages.debian.org/stretch/openssh-client)
29+
- [gettext](https://www.gnu.org/software/gettext) 0.19.8.1
30+
- [openssh-client](https://packages.debian.org/stretch/openssh-client) 7.9p1
31+
- [rsync](https://rsync.samba.org) 3.1.3
3032

3133
### Python versions
3234

@@ -35,6 +37,12 @@ other versions supported as well.
3537

3638
List of supported Python versions are (`<PY_VERSION>` -> base Docker image):
3739

40+
#### 3.3.0
41+
42+
- `py38` -> `python:3.8.3-slim-buster`
43+
- `py37` -> `python:3.7.7-slim-buster`
44+
- `py36` uses same version as in `3.1.0`
45+
3846
#### 3.2.0
3947

4048
- `py38` -> `python:3.8.2-slim-buster`
@@ -76,11 +84,11 @@ To use custom Python version, use tags in your Dockerfile as:
7684
FROM playpauseansdtop/docker-python:<VERSION>-<PY_VERSION>
7785
```
7886

79-
For example, to use `3.0.0b0` version of `docker-python` with Python 3.7 base
87+
For example, to use `3.2.0` version of `docker-python` with Python 3.7 base
8088
image:
8189

8290
```
83-
FROM playpauseandstop/docker-python:3.0.0b0-py37
91+
FROM playpauseandstop/docker-python:3.2.0-py37
8492
```
8593

8694
[List of all available tags](https://hub.docker.com/r/playpauseandstop/docker-python/tags)
@@ -96,11 +104,11 @@ make
96104
To run something, using built image:
97105

98106
```bash
99-
make CMD="..." run
107+
make ARGS="..." run
100108
```
101109

102-
To push image (of specific version):
110+
To push image (of specific tag):
103111

104112
```bash
105-
make VERSION="..." deploy
113+
make TAG="..." deploy
106114
```

0 commit comments

Comments
 (0)