Merge pull request #47 from deepflowys/feature-update-ami

update aws ami
deepflowio · Oct 20, 2022 · cb291e7 · cb291e7
2 parents a6f5e09 + de3114e
commit cb291e7
Show file tree

Hide file tree

Showing 2 changed files with 116 additions and 86 deletions.
diff --git a/.cirun.yml b/.cirun.yml
@@ -30,33 +30,33 @@ runners:
       - "c6id.8xlarge"
       - "cc2.8xlarge"
     machine_image: 
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
 
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
 
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
 
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
     region:
       - "us-east-2"
       - "us-east-2"
@@ -111,25 +111,25 @@ runners:
       - "c6gn.8xlarge"
       - "c7g.8xlarge"
     machine_image: 
-      - "ami-05eebd9a9cda75f21"
-      - "ami-05eebd9a9cda75f21"
-      - "ami-05eebd9a9cda75f21"
-      - "ami-05eebd9a9cda75f21"
+      - "ami-0f03f0478052da1c5"
+      - "ami-0f03f0478052da1c5"
+      - "ami-0f03f0478052da1c5"
+      - "ami-0f03f0478052da1c5"
 
-      - "ami-0651b25cbd07dd480"
-      - "ami-0651b25cbd07dd480"
-      - "ami-0651b25cbd07dd480"
-      - "ami-0651b25cbd07dd480"
+      - "ami-06bbad93bd1d7778d"
+      - "ami-06bbad93bd1d7778d"
+      - "ami-06bbad93bd1d7778d"
+      - "ami-06bbad93bd1d7778d"
 
-      - "ami-00a6ebcf24bf95379"
-      - "ami-00a6ebcf24bf95379"
-      - "ami-00a6ebcf24bf95379"
-      - "ami-00a6ebcf24bf95379"
+      - "ami-068535376185489d8"
+      - "ami-068535376185489d8"
+      - "ami-068535376185489d8"
+      - "ami-068535376185489d8"
 
-      - "ami-0b615a940e613e870"
-      - "ami-0b615a940e613e870"
-      - "ami-0b615a940e613e870"
-      - "ami-0b615a940e613e870"
+      - "ami-002a735105deae7f8"
+      - "ami-002a735105deae7f8"
+      - "ami-002a735105deae7f8"
+      - "ami-002a735105deae7f8"
     region:
       - "us-east-2"
       - "us-east-2"
@@ -151,7 +151,7 @@ runners:
       - "en-west-1"
       - "en-west-1"
     # arm64 architecture spot instances may not be created smoothly
-    preemptible: false
+    preemptible: true
     labels:
       - "cirun-aws-arm64-32c"
   - name: "aws-amd64-16c"
@@ -197,45 +197,45 @@ runners:
       - "c6a.4xlarge"
       - "c6id.4xlarge"
     machine_image: 
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
-      - "ami-0b6d47878d0d5797b"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
+      - "ami-080f95b5d948cd7bb"
 
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
-      - "ami-05e311eefc76f7e7a"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
+      - "ami-07afaa60ce0fcab74"
 
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
-      - "ami-05d0f31079cacc1e8"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
+      - "ami-05ffc6a38b3556c8d"
 
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
-      - "ami-0e5a8659475f55a69"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
+      - "ami-01b5d4f8ba101c2fe"
     region:
       - "us-east-2"
       - "us-east-2"

diff --git a/.github/workflows/app-build.yml b/.github/workflows/app-build.yml
@@ -31,16 +31,27 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - name: install docker
+      # - name: install docker
+      #   run: |
+      #     sudo systemctl stop unattended-upgrades
+      #     curl -fsSL https://get.docker.com | bash
+
+      - name: docker version
         run: |
-          sudo systemctl stop unattended-upgrades
-          curl -fsSL https://get.docker.com | bash
+          docker version
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
           install: true
 
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v2
+        with:
+          registry: "ghcr.io" 
+          username: "${{ github.repository_owner }}"
+          password: "${{ secrets.GITHUB_TOKEN }}" 
+
       - name: Build and push deepflow app images
         uses: docker/build-push-action@v2
         with:
@@ -49,6 +60,8 @@ jobs:
           file: app/Dockerfile_depends
           platforms: linux/amd64
           outputs: type=local,dest=./app/output_amd64
+          cache-from: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE }}:${{ github.ref_name }}-cache-amd54
+          cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE }}:${{ github.ref_name }}-cache-amd4
 
       - name: Package code build results
         run: |
@@ -70,16 +83,27 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - name: install docker
+      # - name: install docker
+      #   run: |
+      #     sudo systemctl stop unattended-upgrades
+      #     curl -fsSL https://get.docker.com | bash
+
+      - name: docker version
         run: |
-          sudo systemctl stop unattended-upgrades
-          curl -fsSL https://get.docker.com | bash
+          docker version
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
           install: true
 
+      - name: Log in to GitHub Docker Registry
+        uses: docker/login-action@v2
+        with:
+          registry: "ghcr.io" 
+          username: "${{ github.repository_owner }}"
+          password: "${{ secrets.GITHUB_TOKEN }}" 
+
       - name: Build and push deepflow app images
         uses: docker/build-push-action@v2
         with:
@@ -88,6 +112,8 @@ jobs:
           file: app/Dockerfile_depends
           platforms: linux/arm64
           outputs: type=local,dest=./app/output_arm64
+          cache-from: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE }}:${{ github.ref_name }}-cache-arm64
+          cache-to: type=registry,mode=max,ref=ghcr.io/${{ github.repository_owner }}/${{ env.IMAGE }}:${{ github.ref_name }}-cache-arm64
 
       - name: Package code build results
         run: |
@@ -113,10 +139,14 @@ jobs:
           submodules: recursive
           fetch-depth: 0
 
-      - name: install docker
+      # - name: install docker
+      #   run: |
+      #     sudo systemctl stop unattended-upgrades
+      #     curl -fsSL https://get.docker.com | bash
+
+      - name: docker version
         run: |
-          sudo systemctl stop unattended-upgrades
-          curl -fsSL https://get.docker.com | bash
+          docker version
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2