Skip to content

Commit c26243d

Browse files
authored
Merge pull request #51 from DataDog/devin.ford/fe-testing
Frontend fix for docker
2 parents f8080ae + f277b1e commit c26243d

File tree

3 files changed

+9
-23
lines changed

3 files changed

+9
-23
lines changed

.github/workflows/frontend.yml

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches: [ main ]
66
paths:
77
- services/frontend/**
8-
workflow_dispatch:
8+
workflow_dispatch:gs
99
branches: [ main ]
1010

1111
defaults:
@@ -21,9 +21,12 @@ jobs:
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v2
24+
25+
- name: Set up QEMU
26+
uses: docker/setup-qemu-action@v2
2427

2528
- name: Set up Docker Buildx
26-
uses: docker/setup-buildx-action@v1
29+
uses: docker/setup-buildx-action@v2
2730

2831
- name: Configure AWS credentials
2932
uses: aws-actions/configure-aws-credentials@v1
@@ -40,20 +43,11 @@ jobs:
4043
username: ${{ secrets.AWS_ACCESS_KEY_ID }}
4144
password: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
4245

43-
- name: Build and push AMD
44-
uses: docker/build-push-action@v2
46+
- name: Build and push
47+
uses: docker/build-push-action@v4
4548
with:
4649
context: ./services/frontend
47-
platforms: linux/amd64
50+
platforms: linux/arm64, linux/amd64
4851
push: true
4952
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend:latest
5053

51-
- name: Build and push ARM
52-
uses: docker/build-push-action@v2
53-
continue-on-error: true
54-
with:
55-
context: ./services/frontend
56-
platforms: linux/arm64
57-
push: true
58-
tags: ${{ secrets.PUBLIC_ECR_REGISTRY }}/storedog/frontend:arm-latest
59-

.github/workflows/release.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,6 @@ jobs:
5454
docker pull "$i":latest
5555
docker tag "$i":latest "$i":$TAG
5656
docker push "$i":$TAG
57-
58-
# Since frontend is images are build to be platform specific, we need to tag and deploy accordingly
59-
if [[ "$i" == *"storedog/frontend"* ]]; then
60-
# deploy frontend arm image
61-
docker pull "$i":arm-latest
62-
docker tag "$i":arm-latest "$i":arm-$TAG
63-
docker push "$i":arm-$TAG
64-
fi
6557
6658
done
6759

services/frontend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ FROM node:16.18.0 as builder
22
WORKDIR /storedog-app
33
COPY . .
44
EXPOSE 3000
5-
RUN ["yarn","install"]
5+
RUN ["yarn","install", "--frozen-lockfile", "--network-timeout 1000000"]

0 commit comments

Comments
 (0)