From 02588358c6317934153483d6ed6ea09314e65410 Mon Sep 17 00:00:00 2001 From: Reid Hewitt Date: Mon, 16 Sep 2024 13:02:54 -0600 Subject: [PATCH] upgrade alpine version; update docker compose commands and remove unnecessary version tag --- Dockerfile | 4 ++-- Makefile | 10 ++++++---- docker-compose.yml | 1 - 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8cb2cd..5d2b6d9 100644 --- a/Dockerfile +++ b/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/ 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 diff --git a/docker-compose.yml b/docker-compose.yml index 0ef64e9..0d5ba66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: "3.7" services: app: build: .