Skip to content

Commit 23cd735

Browse files
committed
feat: cicd
1 parent 33f9dc7 commit 23cd735

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

.github/workflows/cicd.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,7 @@ jobs:
5555
--build-arg NEXT_PUBLIC_API_URL=${{ secrets.NEXT_PUBLIC_API_URL }} \
5656
--build-arg NEXT_PUBLIC_SOCKET_URL=${{ secrets.NEXT_PUBLIC_SOCKET_URL }} \
5757
--build-arg NEXT_PUBLIC_AWS_REGION=${{ secrets.AWS_REGION }} \
58-
<<<<<<< HEAD
5958
--build-arg NEXT_PUBLIC_BUCKET=${{ secrets.NEXT_PUBLIC_BUCKET }} \
60-
=======
61-
--build-arg NEXT_PUBLIC_AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} \
62-
--build-arg NEXT_PUBLIC_AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} \
63-
--build-arg NEXT_PUBLIC_AWS_S3_BUCKET=${{ secrets.AWS_S3_BUCKET }} \
64-
>>>>>>> origin/develop
6559
--build-arg NEXT_PUBLIC_CLOUDFRONT_DOMAIN=${{ secrets.CLOUDFRONT_DOMAIN }} \
6660
-t $IMAGE_NAME:$IMAGE_TAG .
6761
docker push $IMAGE_NAME:$IMAGE_TAG

0 commit comments

Comments
 (0)