Update Nginx from 1.14.2

.circleci/config.yml

@@ -34,8 +34,8 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - run: sudo apt-get update; sudo apt-get install shunit2
-      - run: sudo pip install pytest # todo cache these
+      - run: sudo apt-get update; sudo apt-get install shunit2 python3-pip
+      - run: sudo pip3 install pytest # todo cache these
       - run: sudo make deps # todo cache these
       - run: make test
 
@@ -150,8 +150,7 @@ jobs:
     <<: *defaults
     steps:
       - checkout
-      - setup_remote_docker:
-          version: "20.10.23"
+      - setup_remote_docker
       - run: |
           export WORKDIR=`pwd`
           export CIRCLE_PROJECT_REPONAME=$PROJECT_NAME
@@ -171,8 +170,7 @@ jobs:
       ECR_REPO: 799720048698.dkr.ecr.us-east-1.amazonaws.com
     steps:
       - checkout
-      - setup_remote_docker:
-          version: "20.10.23"
+      - setup_remote_docker
       - run: |
           export WORKDIR=`pwd`
           export CIRCLE_PROJECT_REPONAME=$PROJECT_NAME

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:2
+FROM python:3
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

Dockerfile.skaffold

@@ -1,4 +1,4 @@
-FROM python:2
+FROM python:3
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \

Makefile

@@ -11,7 +11,7 @@ else
 endif
 
 deps:
-	pip install -r requirements.txt
+	pip3 install -r requirements.txt
 
 build:
 	docker build --pull -t install-scripts -f deploy/Dockerfile.prod .
@@ -113,12 +113,12 @@ shell_composer_linux:
 		install-scripts-dev \
 		/bin/bash
 test:
-	python2 -m pytest -v tests
+	python3 -m pytest -v tests
 	./test.sh
 
 run:
 	/dcg --raw > install_scripts/templates/swarm/docker-compose-generate-safe.sh
-	python2 main.py
+	python3 main.py
 
 .PHONY: scan
 scan: build

deploy/Dockerfile.prod

@@ -1,9 +1,9 @@
-FROM golang:1.20 as builder
+FROM golang:1.20 AS builder
 WORKDIR /docker-compose-generate
 COPY ./util/docker-compose-generate /docker-compose-generate
 RUN make build
 
-FROM python:2
+FROM python:3
 
 COPY --from=builder /docker-compose-generate/dcg /dcg
 RUN apt-get update \

okteto.Dockerfile

@@ -4,7 +4,7 @@ COPY ./util/docker-compose-generate /docker-compose-generate
 RUN make build
 
 
-FROM python:2
+FROM python:3
 
 COPY --from=builder /docker-compose-generate/dcg /dcg
 RUN apt-get update && \

requirements.txt

@@ -1,9 +1,25 @@
-boto3==1.7.25
-Flask==0.12.3
-mysql-connector==2.1.7
-pytest==3.0.6
-pytest-mock==1.5.0
-PyYAML==5.4
+blinker==1.8.2
+boto3==1.35.42
+botocore==1.35.42
+click==8.1.7
+constant==0.0.4
+Flask==3.0.3
+iniconfig==2.0.0
+itsdangerous==2.2.0
+Jinja2==3.1.4
+jmespath==1.0.1
+MarkupSafe==3.0.1
+mysql-connector==2.2.9
+packaging==24.1
+pluggy==1.5.0
+pytest==8.3.3
+pytest-mock==3.14.0
+python-dateutil==2.9.0.post0
+PyYAML==6.0.2
+s3transfer==0.10.3
 git+https://github.com/emosbaugh/python-semver@f26d956e2ea13a8159e5629d5b7bf225f8ae5a61#egg=semver
 shellescape==3.8.1
-uWSGI==2.0.17
+six==1.16.0
+urllib3==2.2.3
+uWSGI==2.0.27
+Werkzeug==3.0.4