From 0292531715dcf10f28f06d49e76da6d4f1ece141 Mon Sep 17 00:00:00 2001 From: Reid Hewitt Date: Fri, 13 Sep 2024 10:56:57 -0600 Subject: [PATCH] bump alpine version and fix docker compose commands --- Dockerfile | 4 ++-- Makefile | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8cb2cd..8b3f7ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.19 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/ diff --git a/Makefile b/Makefile index 27a6d29..6d8d658 100644 --- a/Makefile +++ b/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