Merge branch 'main' into snyk-fix-411612fe5fd08c9d3e57285ca588412c

uncovering-world · Jul 11, 2024 · 0f87776 · 0f87776
2 parents 6dbffb0 + 17456ae
commit 0f87776
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/backend/package.json b/backend/package.json
@@ -4,7 +4,7 @@
   "description": "Backend for Track Your Regions",
   "devDependencies": {
     "dotenv-cli": "^7.3.0",
-    "eslint": "^9.0.0",
+    "eslint": "^8.2.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-markdownlint": "^0.6.0",
     "nodemon": "^3.0.1",

diff --git a/deployment/Makefile b/deployment/Makefile
@@ -19,7 +19,7 @@ REQUIRED_ENV_VARS = DB_NAME DB_USER DB_PASSWORD GADM_FILE POSTGIS_VERSION
 # ---- Environment Checks ----
 check-env:
 	@if [ ! -f $(ENV_FILE) ]; then \
-		echo "Error: .env file is missing. Initialize it from .env.example."; \
+		echo "Error: .env.development file is missing. Initialize it from .env.development.example."; \
 		exit 1; \
 	fi
 	@for var in $(REQUIRED_ENV_VARS); do \
@@ -86,7 +86,7 @@ reinit-db: check-gadm-file clean-volume init-db
 stop:
 	$(DC) stop
 
-build: check-env
+build: check-env check-gadm-file
 	$(DC) build
 
 run: check-env

diff --git a/deployment/init-db/requirements.txt b/deployment/init-db/requirements.txt
@@ -2,3 +2,4 @@ psycopg2-binary==2.9.9
 python-dotenv==1.0.0
 GDAL==3.2.2
 Fiona==1.9.4.post1
+zipp>=3.19.1 # not directly required, pinned by Snyk to avoid a vulnerability
diff --git a/frontend/package.json b/frontend/package.json
@@ -38,7 +38,7 @@
     ]
   },
   "devDependencies": {
-    "eslint": "^9.0.0",
+    "eslint": "^8.2.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-plugin-markdownlint": "^0.6.0",
     "react-scripts": "^5.0.1"