Skip to content

Commit a4d4eaf

Browse files
authored
Merge pull request #118 from readthedocs/humitos/remove-label
2 parents 1957993 + 84069ca commit a4d4eaf

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

CONTRIBUTING.rst

+5-8
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,17 @@ are defined in the :doc:`README`.
4646

4747
We follow `semantic versioning`_, but drop the bug fix level version number for
4848
our images, as this level of granularity is not important for any application of
49-
these images. Each release is tagged in Git, and the release version number is
50-
included in the Dockerfile version label (``LABEL version="2.0"``).
49+
these images.
5150

5251
Releases should be merged into one of the ``releases/`` branches, for instance
53-
``releases/2.x``. The version label in the Dockerfile should be updated to the
54-
next version in the series, following semver rules. This commit should then also
55-
be tagged using the new version number.
52+
``releases/2.x``. This commit should then also be tagged using the new version number.
5653

57-
If the version number in the Dockerfile was ``2.0.1`` before, and you implement
54+
If the version number was ``2.0.1`` before, and you implement
5855
a bug fix to the image, the new image will be ``2.0.2``. The output image from
5956
Docker Hub will still be ``2.0`` however. If a new feature is introduced, the
60-
new version tagged and in the Dockerfile will be ``2.1``.
57+
new version tagged will be ``2.1``.
6158

62-
We don't care about bug fix version numbers here, as RTD will only ever have one
59+
We don't care about bug fix version numbers here, as Read the Docs will only ever have one
6360
main ``2.x`` image at a time. There is no need for us to run multiple bug fix
6461
versions at the same time.
6562

Dockerfile

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Read the Docs - Environment base
22
FROM ubuntu:18.04
33
LABEL mantainer="Read the Docs <[email protected]>"
4-
LABEL version="5.0.0"
54

65
ENV DEBIAN_FRONTEND noninteractive
76
ENV APPDIR /app

0 commit comments

Comments
 (0)