fix: command line

co-niverse · Sep 29, 2023 · 0a8b8d0 · 0a8b8d0
1 parent b89c1c7
commit 0a8b8d0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/.github/workflows/deploy-fluentbit.yml b/.github/workflows/deploy-fluentbit.yml
@@ -41,7 +41,6 @@ jobs:
 
     - name: Build and push image to Amazon ECR (dev)
       run: |
-        echo "::set-output name=image::$AWS_ACCOUNT_ID.dkr.ecr.$AWS_REGION.amazonaws.com/$DEV_ECR_REPOSITORY:$IMAGE_TAG"
         docker build -t ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.DEV_ECR_REPOSITORY }}:${{ env.IMAGE_TAG }} .
         docker push ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.DEV_ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
       working-directory: ${{ env.working-directory }}
@@ -62,9 +61,4 @@ jobs:
           docker login -u AWS -p $(aws ecr get-login-password --region ${{ env.AWS_REGION }}) ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com
           docker pull ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.DEV_ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
           docker stop fluentbit-dev && docker rm fluentbit-dev
-          docker run -d --name fluentbit-dev -p 8888:8888 -p 8889:8889 |
-          --network dev-network |
-          -e AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY }} |
-          -e AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} |
-          -e env=dev |
-          ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.DEV_ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
+          docker run -d --name fluentbit-dev -p 8888:8888 -p 8889:8889 --network dev-network -e AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY }} -e AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} -e env=dev ${{ env.AWS_ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com/${{ env.DEV_ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
diff --git a/fluentbit/fluent-bit.conf b/fluentbit/fluent-bit.conf
@@ -36,4 +36,4 @@
 	Name kinesis_streams
 	Match server.log
 	region ap-northeast-2
-	stream kn-server-log-${env}
+	stream kn-server-log-${env}