Skip to content

Update workflows to include arm build platform #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 3, 2023
Merged

Update workflows to include arm build platform #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72c3bb0
add arm build platform
stanleegoodspeed Feb 2, 2023
3633ae1
update compose
stanleegoodspeed Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ads-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/ads/java
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/ads-java:latest

2 changes: 1 addition & 1 deletion .github/workflows/ads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/ads/python
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/ads:latest

2 changes: 1 addition & 1 deletion .github/workflows/attackbox.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/attackbox
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/attackbox:latest

2 changes: 1 addition & 1 deletion .github/workflows/auth.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/ads
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/auth:latest

2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/backend
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/backend:latest

2 changes: 1 addition & 1 deletion .github/workflows/discounts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/discounts
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/discounts:latest

2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/frontend
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend:latest

2 changes: 1 addition & 1 deletion .github/workflows/nginx.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
uses: docker/build-push-action@v2
with:
context: ./services/nginx
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/nginx:latest

20 changes: 8 additions & 12 deletions deploy/docker-compose/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'
services:
frontend:
image: public.ecr.aws/x2b9z2t7/storedog/frontend:1.0.2
image: public.ecr.aws/x2b9z2t7/storedog/frontend:1.0.8
command: yarn dev
volumes:
- "../../services/frontend/site:/storedog-app/site"
Expand All @@ -12,7 +12,7 @@ services:
networks:
- storedog-net
nginx:
image: public.ecr.aws/x2b9z2t7/storedog/nginx:1.0.2
image: public.ecr.aws/x2b9z2t7/storedog/nginx:1.0.8
restart: always
ports:
- "80:80"
Expand Down Expand Up @@ -44,14 +44,12 @@ services:
networks:
- storedog-net
web:
image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.7
image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.8
depends_on:
- 'postgres'
- 'redis'
ports:
- '${DOCKER_HOST_WEB_PORT:-4000}:4000'
volumes:
- 'bundle_cache:/bundle'
environment:
REDIS_URL: redis://redis:6379/0
DB_HOST: postgres
Expand All @@ -60,14 +58,12 @@ services:
networks:
- storedog-net
worker:
image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.7
image: public.ecr.aws/x2b9z2t7/storedog/backend:1.0.8
command: bundle exec sidekiq -C config/sidekiq.yml
depends_on:
- 'postgres'
- 'redis'
- 'web'
volumes:
- 'bundle_cache:/bundle'
environment:
REDIS_URL: redis://redis:6379/0
DB_HOST: postgres
Expand All @@ -76,7 +72,7 @@ services:
networks:
- storedog-net
ads:
image: public.ecr.aws/x2b9z2t7/storedog/ads:1.0.7
image: public.ecr.aws/x2b9z2t7/storedog/ads:1.0.8
command: flask run --port=${ADS_PORT} --host=0.0.0.0
depends_on:
- postgres
Expand All @@ -96,7 +92,7 @@ services:
networks:
- storedog-net
discounts:
image: public.ecr.aws/x2b9z2t7/storedog/discounts:1.0.7
image: public.ecr.aws/x2b9z2t7/storedog/discounts:1.0.8
command: ./my-wrapper-script.sh ${DISCOUNTS_PORT}
depends_on:
- postgres
Expand Down Expand Up @@ -144,5 +140,5 @@ networks:
driver: bridge
ipam:
config:
- subnet: 172.18.0.0/16
gateway: 172.18.0.1
- subnet: 172.43.0.0/16
gateway: 172.43.0.1