Merge pull request #67 from stephengtuggy/fix-ci

.circleci/config.yml, app/Dockerfile, .github/workflows/shiftleft-ana…
stephengtuggy · Dec 4, 2022 · 6bf9162 · 6bf9162
2 parents 4075cc0 + eeb454b
commit 6bf9162
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,7 +6,7 @@ jobs:
     steps:
       - checkout
       - run: |
-          curl -L https://github.com/docker/compose/releases/download/1.26.2/docker-compose-`uname -s`-`uname -m` -o ~/docker-compose
+          curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` -o ~/docker-compose
           chmod +x ~/docker-compose
           sudo mv ~/docker-compose /usr/local/bin/docker-compose
       - run: |

diff --git a/.github/workflows/shiftleft-analysis.yml b/.github/workflows/shiftleft-analysis.yml
@@ -27,7 +27,7 @@ jobs:
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade-strategy eager --upgrade pip
-        python -m pip install --upgrade-strategy eager --upgrade --use-feature=2020-resolver -r app/requirements.txt
+        python -m pip install --upgrade-strategy eager --upgrade -r app/requirements.txt
 
     - name: Perform Scan
       uses: ShiftLeftSecurity/scan-action@master

diff --git a/app/Dockerfile b/app/Dockerfile
@@ -14,7 +14,7 @@ RUN python -m pip install --upgrade --upgrade-strategy eager pip
 
 RUN mkdir -p /usr/src/app
 COPY ./requirements.txt /usr/src/app
-RUN python -m pip install --upgrade --upgrade-strategy eager --use-feature=2020-resolver -r ./requirements.txt
+RUN python -m pip install --upgrade --upgrade-strategy eager -r ./requirements.txt
 
 COPY . /usr/src/app