Merge branch 'main' into update-db-backup-restore

merge with main

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.14
+FROM alpine:3.17
 
 RUN apk update && apk add \
   aws-cli \
@@ -9,7 +9,7 @@ RUN apk update && apk add \
   postgresql-client \
   python3 \
   redis \
-  stunnel
+  stunnel 
 
 # Add local scripts to global scope
 COPY bin/ /usr/local/bin/

Makefile

@@ -4,19 +4,21 @@
 BATS_ARGS:=--recursive --pretty
 
 build:
-	docker-compose build
+	docker compose build
 
 clean:
-	docker-compose down -v --remove-orphans
+	docker compose down -v --remove-orphans
 
 production:
 	docker build . -t ghcr.io/gsa/cf-backup-manager:latest
 
 test:
-	docker-compose run --rm app test/bats/bin/bats $(BATS_ARGS) test/*.bats
+	docker compose run --rm app test/bats/bin/bats $(BATS_ARGS) test/*.bats
 
 up:
-	docker-compose up -d
+	docker compose up -d
 
+down:
+	docker compose down
 
 .PHONY: test

docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: "3.7"
 services:
   app:
     build: .