SYS-612 upgrade jira helm chart, add self-signed cert vol mount (#126)

instantlinux · Aug 31, 2023 · eabb149 · eabb149
1 parent 90273cf
commit eabb149
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 138 deletions.
diff --git a/images/python-builder/Dockerfile b/images/python-builder/Dockerfile
@@ -17,10 +17,10 @@ ENV BUILD_DIR=/build \
 ARG BUILDX_VERSION=0.11.2
 ARG COMPOSE_VERSION=2.20.2
 ARG HELM_VERSION=3.11.3-r1
-ARG KUBECTL_VERSION=1.26.7
+ARG KUBECTL_VERSION=1.28.1
 ARG MUSL_VERSION=1.2.4-r1
 ARG PIP_VERSION=23.2.1
-ARG PYTHON_VERSION=3.11.4-r0
+ARG PYTHON_VERSION=3.11.5-r0
 ARG PYCRYPTOGRAPHY_VERSION=41.0.3-r0
 ARG PYPILLOW_VERSION=9.5.0-r1
 ARG _DOCKER_DOWNLOADS=https://github.com/docker/compose/releases/download
@@ -32,7 +32,7 @@ ARG DOCKER_GID=485
 ARG BUILD_UID=1001
 ARG BUILDX_SHA=311568ee69715abc46163fd688e56c77ab0144ff32e116d0f293bfc3470e75b7
 ARG COMPOSE_SHA=b9385dabb7931636a3afc0aee94625ebff3bb29584493a87804afb6ebaf2d916
-ARG KUBECTL_SHA=d9dc7741e5f279c28ef32fbbe1daa8ebc36622391c33470efed5eb8426959971
+ARG KUBECTL_SHA=e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1
 
 COPY Pipfile* /root/
 RUN addgroup -g $DOCKER_GID docker && \

diff --git a/images/python-wsgi/Dockerfile b/images/python-wsgi/Dockerfile
@@ -11,10 +11,10 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-url=https://github.com/instantlinux/python-wsgi
 ENV PYTHONPATH=
 ARG PIP_VERSION=23.2.1
-ARG PYTHON_VERSION=3.11.4-r0
+ARG PYTHON_VERSION=3.11.5-r0
 ARG PYCRYPTOGRAPHY_VERSION=41.0.3-r0
 ARG PYPILLOW_VERSION=9.5.0-r1
-ARG UWSGI_VERSION=2.0.21-r3
+ARG UWSGI_VERSION=2.0.22-r0
 
 COPY Pipfile* uwsgi.ini /usr/src/
 
@@ -28,7 +28,7 @@ RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/community' \
       py3-pycryptodomex py3-greenlet py3-itsdangerous py3-jinja2 \
       py3-passlib py3-pillow=$PYPILLOW_VERSION py3-requests py3-setuptools \
       py3-virtualenv py3-werkzeug python3==$PYTHON_VERSION \
-      uwsgi==$UWSGI_VERSION uwsgi-python3 zlib && \
+      uwsgi@edge==$UWSGI_VERSION uwsgi-python3@edge zlib && \
     pip install --upgrade pipenv pip==$PIP_VERSION && \
     cd /usr/src && pipenv install --system --deploy && pip freeze && \
     apk del .fetch-deps && rm -r /var/cache/apk/* /root/.cache

diff --git a/images/python-wsgi/Pipfile b/images/python-wsgi/Pipfile
@@ -29,7 +29,7 @@ Pillow = "==9.5.0"
 pycryptodomex = "==3.17"
 python-dateutil = "==2.8.2"
 requests = "==2.31.0"
-uwsgi = "==2.0.21"
+uwsgi = "==2.0.22"
 werkzeug = "==2.2.3"
 
 alembic = "*"