From 2cb891af5f7d19e425db985ae4674286dc7ddeb1 Mon Sep 17 00:00:00 2001 From: Henrique Goncalves Date: Sun, 27 Jun 2021 05:25:57 -0300 Subject: [PATCH] Helm and fixes (#731) * helm init * improve helm * cache attempt * cache attempt 2 --- .github/workflows/dev.yml | 15 +++++++++++++++ .github/workflows/release.yml | 18 +++++++++++++++++- helm/Chart.yaml | 5 +++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index b2fafa835..c253e01af 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -33,6 +33,14 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: BUILD uses: docker/build-push-action@v2 with: @@ -40,6 +48,8 @@ jobs: load: true tags: squidex-tmp build-args: "SQUIDEX__VERSION=4.0.0-dev-${{ env.BUILD_NUMBER }}" + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new - name: Export Image run: docker save squidex-tmp | gzip > squidex-tmp.tar.gz @@ -50,6 +60,11 @@ jobs: path: squidex-tmp.tar.gz key: squidex-dev-image-${{ github.sha }} + - name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache + test: needs: build runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d284bdf4..533ef70f5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,6 +22,14 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - name: BUILD uses: docker/build-push-action@v2 with: @@ -29,6 +37,8 @@ jobs: load: true tags: squidex-tmp build-args: "SQUIDEX__VERSION=${{ env.GITHUB_REF_SLUG }}" + cache-from: type=local,src=/tmp/.buildx-cache + cache-to: type=local,dest=/tmp/.buildx-cache-new - name: Export Image run: docker save squidex-tmp | gzip > squidex-tmp.tar.gz @@ -39,6 +49,11 @@ jobs: path: squidex-tmp.tar.gz key: squidex-release-image-${{ github.sha }} + - name: Move cache + run: | + rm -rf /tmp/.buildx-cache + mv /tmp/.buildx-cache-new /tmp/.buildx-cache + test: needs: build runs-on: ubuntu-latest @@ -147,8 +162,9 @@ jobs: - name: Get Binaries run: | mkdir /build 2> /dev/null - docker create --name squidex-container squidex-tmp + docker run -d --name squidex-container squidex-tmp docker cp squidex-container:/app/. /build/ + docker rm -f squidex-container - name: ZIP Binaries run: | diff --git a/helm/Chart.yaml b/helm/Chart.yaml index 6b962ff0b..af3524136 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -11,6 +11,11 @@ home: https://squidex.io/ keywords: - cms + - headless-cms + - mongodb + - csharp + - asp-net-core + - asp-net sources: - https://github.com/Squidex/squidex