Skip to content

Commit

Permalink
Merge pull request #27 from GSA/upgrade-cleanup
Browse files Browse the repository at this point in the history
upgrade alpine version
  • Loading branch information
FuhuXia authored Sep 16, 2024
2 parents ba0202e + 0258835 commit d42ba33
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.14
FROM alpine:3.17

RUN apk update && apk add \
aws-cli \
Expand All @@ -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/
Expand Down
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.7"
services:
app:
build: .
Expand Down

0 comments on commit d42ba33

Please sign in to comment.