Skip to content

Commit

Permalink
Merge pull request #649 from replicatedhq/divolgin/sc-105903/patch-py…
Browse files Browse the repository at this point in the history
…yaml-in-replicated-installer-for

Bump PyYAML 4.2b4 -> 5.4
  • Loading branch information
divolgin authored Jun 28, 2024
2 parents fefc1b6 + aecf06c commit 0065e69
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ deps:
pip install -r requirements.txt

build:
docker build -t install-scripts -f deploy/Dockerfile.prod .
docker build --pull -t install-scripts -f deploy/Dockerfile.prod .

dev:
docker build -t install-scripts-dev .
Expand Down Expand Up @@ -119,3 +119,8 @@ test:
run:
/dcg --raw > install_scripts/templates/swarm/docker-compose-generate-safe.sh
python2 main.py

.PHONY: scan
scan: build
curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b bin
./bin/grype --fail-on medium --only-fixed install-scripts:latest
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Flask==0.12.3
mysql-connector==2.1.7
pytest==3.0.6
pytest-mock==1.5.0
PyYAML==4.2b4
PyYAML==5.4
git+https://github.com/emosbaugh/python-semver@f26d956e2ea13a8159e5629d5b7bf225f8ae5a61#egg=semver
shellescape==3.8.1
uWSGI==2.0.17

0 comments on commit 0065e69

Please sign in to comment.