Skip to content

Commit

Permalink
update docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
briskt committed Jul 31, 2024
1 parent 5818c6e commit db57113
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-deploy-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Test
run: docker-compose -f actions-services.yml run --rm test ./scripts/test.sh
run: docker compose -f actions-services.yml run --rm test ./scripts/test.sh

deploy:
name: Deploy to AWS Lambda
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4
- name: Deploy
run: docker-compose -f actions-services.yml run --rm app ./scripts/deploy.sh
run: docker compose -f actions-services.yml run --rm app ./scripts/deploy.sh

build-and-publish:
name: Build and Publish
Expand Down
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@ demo: proxy ui app dbinit
./local_data.sh

proxy:
docker-compose up -d proxy
docker compose up -d proxy

ui:
docker-compose up -d ui
docker compose up -d ui

app:
docker-compose kill app
docker-compose rm -f app
docker-compose up -d app
docker compose kill app
docker compose rm -f app
docker compose up -d app

test: clean dbinit
docker-compose run --rm app go test ./...
docker compose run --rm app go test ./...

db:
docker-compose up -d dynamo
docker compose up -d dynamo

dbinit: db wait createwebauthntable createapikeytable

Expand Down Expand Up @@ -55,5 +55,5 @@ showwebauth:
--region localhost

clean:
docker-compose kill
docker-compose rm -f
docker compose kill
docker compose rm -f
2 changes: 0 additions & 2 deletions actions-services.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3"

services:
test:
build: .
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.7"

services:
proxy:
image: silintl/traefik-https-proxy
Expand Down

0 comments on commit db57113

Please sign in to comment.