Skip to content

Commit d42ba33

Browse files
authored
Merge pull request #27 from GSA/upgrade-cleanup
upgrade alpine version
2 parents ba0202e + 0258835 commit d42ba33

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.14
1+
FROM alpine:3.17
22

33
RUN apk update && apk add \
44
aws-cli \
@@ -9,7 +9,7 @@ RUN apk update && apk add \
99
postgresql-client \
1010
python3 \
1111
redis \
12-
stunnel
12+
stunnel
1313

1414
# Add local scripts to global scope
1515
COPY bin/ /usr/local/bin/

Makefile

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@
44
BATS_ARGS:=--recursive --pretty
55

66
build:
7-
docker-compose build
7+
docker compose build
88

99
clean:
10-
docker-compose down -v --remove-orphans
10+
docker compose down -v --remove-orphans
1111

1212
production:
1313
docker build . -t ghcr.io/gsa/cf-backup-manager:latest
1414

1515
test:
16-
docker-compose run --rm app test/bats/bin/bats $(BATS_ARGS) test/*.bats
16+
docker compose run --rm app test/bats/bin/bats $(BATS_ARGS) test/*.bats
1717

1818
up:
19-
docker-compose up -d
19+
docker compose up -d
2020

21+
down:
22+
docker compose down
2123

2224
.PHONY: test

docker-compose.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
version: "3.7"
32
services:
43
app:
54
build: .

0 commit comments

Comments
 (0)