From 1b203f047153977b7d8aa8da7275dcf6d4c043c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 04:42:16 +0000 Subject: [PATCH 1/3] Build(deps): Bump cryptography in /sld-remote-state Bumps [cryptography](https://github.com/pyca/cryptography) from 38.0.4 to 39.0.1. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/38.0.4...39.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- sld-remote-state/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sld-remote-state/requirements.txt b/sld-remote-state/requirements.txt index 3fbe17ba..b7ddb4da 100644 --- a/sld-remote-state/requirements.txt +++ b/sld-remote-state/requirements.txt @@ -9,7 +9,7 @@ certifi==2022.12.7 cffi==1.15.1 charset-normalizer==2.1.1 click==8.1.3 -cryptography==38.0.4 +cryptography==39.0.1 dnspython==2.2.1 fastapi==0.88.0 google-api-core==2.11.0 From 992ebdf831dbf091d0193769607c5499efcdd2d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 8 Feb 2023 04:42:17 +0000 Subject: [PATCH 2/3] Build(deps): Bump cryptography from 38.0.4 to 39.0.1 in /sld-dashboard Bumps [cryptography](https://github.com/pyca/cryptography) from 38.0.4 to 39.0.1. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/38.0.4...39.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- sld-dashboard/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sld-dashboard/requirements.txt b/sld-dashboard/requirements.txt index c33ac8c0..457496ab 100644 --- a/sld-dashboard/requirements.txt +++ b/sld-dashboard/requirements.txt @@ -6,7 +6,7 @@ cffi==1.15.1 chardet==5.1.0 charset-normalizer==2.1.1 click==8.1.3 -cryptography==38.0.4 +cryptography==39.0.1 Deprecated==1.2.13 dnspython==2.2.1 email-validator==1.3.0 From 6bddc81f6cdbfacab1e26d9be401bb14ed54c1e8 Mon Sep 17 00:00:00 2001 From: D10S0VSkY-OSS <79284025+D10S0VSkY-OSS@users.noreply.github.com> Date: Fri, 10 Feb 2023 22:38:29 +0100 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=90=9Bfix:=20Build(deps):=20Bump=20cr?= =?UTF-8?q?yptography=20from=2038.0.4=20to=2039.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/sld-api-docker-image.yml | 4 +- .../workflows/sld-dashboard-docker-image.yml | 4 +- .../sld-remote-state-docker-image.yml | 4 +- .../workflows/sld-schedule-docker-image.yml | 4 +- .../kubernetes/k8s/kustomization.yaml | 2 +- sld-api-backend/Dockerfile | 13 ++---- sld-api-backend/requirements.txt | 43 ++++++++++--------- 7 files changed, 34 insertions(+), 40 deletions(-) diff --git a/.github/workflows/sld-api-docker-image.yml b/.github/workflows/sld-api-docker-image.yml index a5a5b6d3..d414c4a0 100644 --- a/.github/workflows/sld-api-docker-image.yml +++ b/.github/workflows/sld-api-docker-image.yml @@ -24,11 +24,11 @@ jobs: - name: Build the Docker image with tag working-directory: ./sld-api-backend - run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-api:2.16.0 + run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-api:2.17.0 - name: Docker Push with tag #if: github.event.pull_request.merged == true - run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-api:2.16.0 + run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-api:2.17.0 - name: Build the Docker image working-directory: ./sld-api-backend diff --git a/.github/workflows/sld-dashboard-docker-image.yml b/.github/workflows/sld-dashboard-docker-image.yml index 72d4a3c4..739eb3fd 100644 --- a/.github/workflows/sld-dashboard-docker-image.yml +++ b/.github/workflows/sld-dashboard-docker-image.yml @@ -24,11 +24,11 @@ jobs: - name: Build the Docker image with tags working-directory: ./sld-dashboard - run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.14.0 + run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.15.0 - name: Docker Push with tags #if: github.event.pull_request.merged == true - run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.14.0 + run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-dashboard:2.15.0 - name: Build the Docker image working-directory: ./sld-dashboard diff --git a/.github/workflows/sld-remote-state-docker-image.yml b/.github/workflows/sld-remote-state-docker-image.yml index e93a16f8..c900028e 100644 --- a/.github/workflows/sld-remote-state-docker-image.yml +++ b/.github/workflows/sld-remote-state-docker-image.yml @@ -24,11 +24,11 @@ jobs: - name: Build the Docker image with tags working-directory: ./sld-remote-state - run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.9.0 + run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.10.0 - name: Docker Push with tags #if: github.event.pull_request.merged == true - run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.9.0 + run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-remote-state:2.10.0 - name: Build the Docker image working-directory: ./sld-remote-state diff --git a/.github/workflows/sld-schedule-docker-image.yml b/.github/workflows/sld-schedule-docker-image.yml index bf51f75b..d8185d32 100644 --- a/.github/workflows/sld-schedule-docker-image.yml +++ b/.github/workflows/sld-schedule-docker-image.yml @@ -24,11 +24,11 @@ jobs: - name: Build the Docker image with tags working-directory: ./sld-schedule - run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.5.0 + run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.6.0 - name: Docker Push with tags #if: github.event.pull_request.merged == true - run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.5.0 + run: docker push ${{ secrets.DOCKER_USERNAME }}/sld-schedule:2.6.0 - name: Build the Docker image working-directory: ./sld-schedule diff --git a/play-with-sld/kubernetes/k8s/kustomization.yaml b/play-with-sld/kubernetes/k8s/kustomization.yaml index 09aacaea..5626c9a3 100644 --- a/play-with-sld/kubernetes/k8s/kustomization.yaml +++ b/play-with-sld/kubernetes/k8s/kustomization.yaml @@ -5,7 +5,7 @@ kind: Kustomization commonLabels: app: stack-lifecycle-deploy environment: play - version: 2.21.0 + version: 2.21.2 resources: - mysql-service.yml diff --git a/sld-api-backend/Dockerfile b/sld-api-backend/Dockerfile index d67dba9f..614290df 100644 --- a/sld-api-backend/Dockerfile +++ b/sld-api-backend/Dockerfile @@ -13,20 +13,13 @@ RUN groupadd --gid 10000 sld && \ RUN echo $TZ > /etc/timezone && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime -RUN export DEBIAN_FRONTEND=noninteractive && \ -apt-get update && \ -apt-get -yq install software-properties-common && \ -add-apt-repository ppa:deadsnakes/ppa RUN export DEBIAN_FRONTEND=noninteractive && \ apt-get update && \ apt-get upgrade -yq && \ apt-get -yq install \ -python3.11 pip default-libmysqlclient-dev zip git tzdata python3.11-dev - -RUN ln -s /usr/bin/python3.11 /usr/bin/python && \ -python -m pip install --upgrade setuptools && \ -python -m pip install --no-cache-dir -r requirements.txt +python3.10 pip default-libmysqlclient-dev zip git tzdata && \ +pip install --no-cache-dir -r requirements.txt RUN apt-get clean autoclean && \ apt-get autoremove -y && \ @@ -36,4 +29,4 @@ rm -rf /var/lib/{apt,dpkg,cache,log}/ ADD . /app/ RUN chown -R sld /app -USER sld +USER sld \ No newline at end of file diff --git a/sld-api-backend/requirements.txt b/sld-api-backend/requirements.txt index 24a3d526..6764324f 100644 --- a/sld-api-backend/requirements.txt +++ b/sld-api-backend/requirements.txt @@ -2,66 +2,67 @@ aioredis==2.0.1 amqp==5.1.1 anyio==3.6.2 async-timeout==4.0.2 -attrs==22.1.0 +attrs==22.2.0 bcrypt==4.0.1 billiard==3.6.4.0 celery==5.2.7 certifi==2022.12.7 cffi==1.15.1 -charset-normalizer==2.1.1 +charset-normalizer==3.0.1 click==8.1.3 click-didyoumean==0.3.0 click-plugins==1.1.1 click-repl==0.2.0 croniter==1.3.8 -cryptography==38.0.4 -dependency-injector==4.40.0 +cryptography==39.0.1 +dependency-injector==4.41.0 Deprecated==1.2.13 -dnspython==2.2.1 +dnspython==2.3.0 ecdsa==0.18.0 -email-validator==1.3.0 -fastapi==0.88.0 +email-validator==1.3.1 +exceptiongroup==1.1.0 +fastapi==0.91.0 fastapi-limiter==0.1.5 fastapi-versioning==0.10.0 -greenlet==2.0.1 +greenlet==2.0.2 h11==0.14.0 idna==3.4 -iniconfig==1.1.1 +iniconfig==2.0.0 Jinja2==3.1.2 jmespath==1.0.1 kombu==5.2.4 -MarkupSafe==2.1.1 +MarkupSafe==2.1.2 mysqlclient==2.1.1 -packaging==21.3 +packaging==23.0 passlib==1.7.4 password-strength==0.0.3.post2 pluggy==1.0.0 -prompt-toolkit==3.0.33 +prompt-toolkit==3.0.36 py==1.11.0 pyasn1==0.4.8 pycparser==2.21 -pydantic==1.10.2 +pydantic==1.10.4 pyhcl==0.4.4 PyJWT==2.6.0 PyMySQL==1.0.2 pyparsing==3.0.9 -pytest==7.2.0 +pytest==7.2.1 python-dateutil==2.8.2 python-jose==3.3.0 python-multipart==0.0.5 python-usernames==0.3.1 -pytz==2022.6 -redis==4.4.0rc4 -requests==2.28.1 +pytz==2022.7.1 +redis==4.5.1 +requests==2.28.2 rsa==4.9 six==1.16.0 sniffio==1.3.0 -SQLAlchemy==1.4.44 -starlette==0.22.0 +SQLAlchemy==2.0.3 +starlette==0.24.0 tomli==2.0.1 typing_extensions==4.4.0 -urllib3==1.26.13 +urllib3==1.26.14 uvicorn==0.20.0 vine==5.0.0 -wcwidth==0.2.5 +wcwidth==0.2.6 wrapt==1.14.1