From 7f3c3c4184bd6f122955d88c265108e1559c3372 Mon Sep 17 00:00:00 2001
From: redhdx <lredhdx@gmail.com>
Date: Mon, 8 Apr 2024 14:53:02 +0800
Subject: [PATCH 1/2] feature: add fncy logo

---
 cmd/faucet/faucet.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmd/faucet/faucet.html b/cmd/faucet/faucet.html
index 950f811f7..264129a49 100644
--- a/cmd/faucet/faucet.html
+++ b/cmd/faucet/faucet.html
@@ -5,6 +5,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
+	<link rel="icon" href="https://fncyscan.fncy.world/favicon.ico">
 	<title>{{.Network}}: Faucet</title>
 
 	<link href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" />

From fac1d3985c681ed66cf29ca7bc3cceb6360a0f25 Mon Sep 17 00:00:00 2001
From: ArthurMa <4406arthur@gmail.com>
Date: Mon, 8 Apr 2024 15:11:13 +0800
Subject: [PATCH 2/2] Update docker-build.yaml

---
 .github/workflows/docker-build.yaml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 0c4d1f2ad..55bbc14f9 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -12,14 +12,13 @@ on:
 env:
   REGION: us-east-1
   ECR_REGISTRY_ID: 553885929720
-  AWS_ASSUMED_ROLE_ARN: arn:aws:iam::553885929720:role/tf_nodereal_prod_ecr_cicd_deployment_assume_role
   # Notice: must modify here to fit your service config path
   GIT_SYNC_PATH: qa/gitops/qa-us/demo-app/values.yaml
   TAG_FIELD: .image.tag
 
 jobs:
   CI:
-    runs-on: [self-hosted,qa-infra-k8s]
+    runs-on: [self-hosted,prod-cicd-runners]
     steps:
     - uses: actions/checkout@v3
     # - uses: actions/setup-go@v3
@@ -30,25 +29,14 @@ jobs:
     #   with:
     #     # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
     #     version: v1.45.2
-    - name: aws assume role
-      id: aws-assume-role
-      run: |
-        UUID=$(cat /proc/sys/kernel/random/uuid)
-        OUT=$(aws sts assume-role --role-arn $AWS_ASSUMED_ROLE_ARN --role-session-name $UUID)
-        echo ::set-output name=aws_access_key_id::"$(echo $OUT | jq -r '.Credentials''.AccessKeyId')"
-        echo ::set-output name=aws_secret_key::"$(echo $OUT | jq -r '.Credentials''.SecretAccessKey')"
-        echo ::set-output name=aws_sessions_token::"$(echo $OUT | jq -r '.Credentials''.SessionToken')"
     - name: Build, tag, and push image to Amazon ECR
-      env:
-        AWS_ACCESS_KEY_ID: ${{ steps.aws-assume-role.outputs.aws_access_key_id }}
-        AWS_SECRET_ACCESS_KEY: ${{ steps.aws-assume-role.outputs.aws_secret_key }}
-        AWS_SESSION_TOKEN: ${{ steps.aws-assume-role.outputs.aws_sessions_token }}
       run: |
         aws ecr get-login-password --region ${REGION} | docker login --username AWS --password-stdin ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com
-        aws ecr --region $REGION describe-repositories --registry-id $ECR_REGISTRY_ID --repository-names ${GITHUB_REPOSITORY#*/} || aws ecr --region $REGION create-repository --registry-id $ECR_REGISTRY_ID --repository-name ${GITHUB_REPOSITORY#*/}
-        aws ecr --region $REGION set-repository-policy --registry-id $ECR_REGISTRY_ID --repository-name ${GITHUB_REPOSITORY#*/} --policy-text file:///home/runner/repo-access-permissions.json
         docker build -t ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com/${GITHUB_REPOSITORY#*/}:${GITHUB_SHA} .
         docker push ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com/${GITHUB_REPOSITORY#*/}:${GITHUB_SHA}
+
+        docker build -t ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com/faucet:${GITHUB_SHA} -f Dockerfile.alltools .
+        docker push ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com/faucet:${GITHUB_SHA}
   # CD:
   #   needs: [CI]
   #   runs-on: [self-hosted,qa-infra-k8s]