diff options
| author | Balasankar 'Balu' C <balasankar@gitlab.com> | 2023-03-10 08:19:49 +0300 |
|---|---|---|
| committer | Balasankar 'Balu' C <balasankar@gitlab.com> | 2023-03-10 08:19:49 +0300 |
| commit | 9bbd3fcd06afb6937a62a264a605a2a7bb118489 (patch) | |
| tree | 62f582a76b750e87edb73dc255fadb1e61358b6b | |
| parent | b9c3674e8cfba760da1d98b78655c833d28e16a0 (diff) | |
| parent | 59fee2b54c1bc025f59573a49ff5ab930aec62ee (diff) | |
Merge branch 'bw-update-docutils' into 'master'
Update docutils package to 0.19
See merge request https://gitlab.com/gitlab-org/build/CNG/-/merge_requests/1311
Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Andrew Patterson <apatterson@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Brett Walker <bwalker@gitlab.com>
| -rw-r--r-- | gitlab-sidekiq/Dockerfile | 2 | ||||
| -rw-r--r-- | gitlab-sidekiq/Dockerfile.build.ubi8 | 2 | ||||
| -rw-r--r-- | gitlab-webservice/Dockerfile | 2 | ||||
| -rw-r--r-- | gitlab-webservice/Dockerfile.build.ubi8 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gitlab-sidekiq/Dockerfile b/gitlab-sidekiq/Dockerfile index f6868413..995676f7 100644 --- a/gitlab-sidekiq/Dockerfile +++ b/gitlab-sidekiq/Dockerfile @@ -10,7 +10,7 @@ FROM ${CI_REGISTRY_IMAGE}/gitlab-python:${PYTHON_TAG} as python FROM ${FROM_IMAGE}:${TAG} ARG GITLAB_USER=git -ARG DOCUTILS_VERSION="0.16" +ARG DOCUTILS_VERSION="0.19" # BEGIN python install COPY --from=python /usr/local/bin /usr/local/bin/ diff --git a/gitlab-sidekiq/Dockerfile.build.ubi8 b/gitlab-sidekiq/Dockerfile.build.ubi8 index b5394662..0c33a167 100644 --- a/gitlab-sidekiq/Dockerfile.build.ubi8 +++ b/gitlab-sidekiq/Dockerfile.build.ubi8 @@ -2,7 +2,7 @@ ARG BUILD_IMAGE= FROM ${BUILD_IMAGE} -ARG DOCUTILS_VERSION=0.16 +ARG DOCUTILS_VERSION=0.19 ADD gitlab-python.tar.gz / diff --git a/gitlab-webservice/Dockerfile b/gitlab-webservice/Dockerfile index 140f8a9f..e325695f 100644 --- a/gitlab-webservice/Dockerfile +++ b/gitlab-webservice/Dockerfile @@ -11,7 +11,7 @@ FROM ${FROM_IMAGE}:${TAG} ARG DATADIR=/var/opt/gitlab ARG CONFIG=/srv/gitlab/config -ARG DOCUTILS_VERSION="0.16" +ARG DOCUTILS_VERSION="0.19" COPY --from=python /usr/local/bin /usr/local/bin/ COPY --from=python /usr/local/lib /usr/local/lib/ diff --git a/gitlab-webservice/Dockerfile.build.ubi8 b/gitlab-webservice/Dockerfile.build.ubi8 index b5394662..0c33a167 100644 --- a/gitlab-webservice/Dockerfile.build.ubi8 +++ b/gitlab-webservice/Dockerfile.build.ubi8 @@ -2,7 +2,7 @@ ARG BUILD_IMAGE= FROM ${BUILD_IMAGE} -ARG DOCUTILS_VERSION=0.16 +ARG DOCUTILS_VERSION=0.19 ADD gitlab-python.tar.gz / |