From 5f3567e80899e609229ab996a12a24ddefac37c0 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:02:16 +0200 Subject: [PATCH 01/15] Create github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 34 +++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .github/workflows/github-actions-demo.yml diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml new file mode 100644 index 000000000..d3abe7d12 --- /dev/null +++ b/.github/workflows/github-actions-demo.yml @@ -0,0 +1,34 @@ +name: push-new-image + +on: + push: + branches: + - 'main' + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: coollabsio/coolify-test:latest From 4097378847974d39b0a1444c94190de453e4006b Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:05:01 +0200 Subject: [PATCH 02/15] Update github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index d3abe7d12..75e996153 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -3,7 +3,7 @@ name: push-new-image on: push: branches: - - 'main' + - 'gh-actions' jobs: docker: From 902a764ff2d5547d74b832e38911b5f7ef63ae8d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:06:15 +0200 Subject: [PATCH 03/15] Update github-actions-demo.yml --- .github/workflows/github-actions-demo.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions-demo.yml index 75e996153..dded1acd3 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions-demo.yml @@ -1,4 +1,4 @@ -name: push-new-image +name: ci on: push: @@ -12,19 +12,19 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - - + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - + - name: Login to DockerHub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - + - name: Build and push uses: docker/build-push-action@v2 with: From 435f063c365313202118075fdad79344183982a8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:20:46 +0200 Subject: [PATCH 04/15] Update and rename github-actions-demo.yml to github-actions.yml --- .../workflows/{github-actions-demo.yml => github-actions.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{github-actions-demo.yml => github-actions.yml} (98%) diff --git a/.github/workflows/github-actions-demo.yml b/.github/workflows/github-actions.yml similarity index 98% rename from .github/workflows/github-actions-demo.yml rename to .github/workflows/github-actions.yml index dded1acd3..f074ef559 100644 --- a/.github/workflows/github-actions-demo.yml +++ b/.github/workflows/github-actions.yml @@ -6,7 +6,7 @@ on: - 'gh-actions' jobs: - docker: + build: runs-on: ubuntu-latest steps: - From 86b7824c78ab0672a85726559178c2250d8b4fed Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:22:54 +0200 Subject: [PATCH 05/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index f074ef559..3608633fd 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -24,6 +24,20 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Cache pnpm modules + uses: actions/cache@v2 + with: + path: ~/.pnpm-store + key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}- + + - + uses: pnpm/action-setup@v2.1.0 + with: + version: 7.0.0 + run_install: false - name: Build and push uses: docker/build-push-action@v2 From a4301c5d23ff298caac4e4ee05cae857be874377 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:32:35 +0200 Subject: [PATCH 06/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 3608633fd..ae6680669 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -1,4 +1,4 @@ -name: ci +name: release-coolify on: push: @@ -12,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - @@ -24,20 +24,6 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Cache pnpm modules - uses: actions/cache@v2 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}- - - - - uses: pnpm/action-setup@v2.1.0 - with: - version: 7.0.0 - run_install: false - name: Build and push uses: docker/build-push-action@v2 @@ -46,3 +32,5 @@ jobs: platforms: linux/amd64,linux/arm64 push: true tags: coollabsio/coolify-test:latest + cache-from: type=registry,ref=coollabsio/coolify-test:buildcache + cache-to: type=registry,ref=coollabsio/coolify-test:buildcache,mode=max From 4f662dbf215a7c025e6ccf5c902bdd58f86420f8 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:36:46 +0200 Subject: [PATCH 07/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index ae6680669..e7a334b3d 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -29,7 +29,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 push: true tags: coollabsio/coolify-test:latest cache-from: type=registry,ref=coollabsio/coolify-test:buildcache From c07d6aa702f306c2df4bba637c906b1b566e0dd2 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:44:48 +0200 Subject: [PATCH 08/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index e7a334b3d..b8e1b010f 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -6,7 +6,7 @@ on: - 'gh-actions' jobs: - build: + make-it-coolifyed: runs-on: ubuntu-latest steps: - From 1211f3c9fdc23e511d0823b150817e1ea8889813 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 13:59:59 +0200 Subject: [PATCH 09/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index b8e1b010f..4c59cf715 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -24,6 +24,10 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Read package.json version + uses: dutscher/read-package-json-endpoint-actions@v1.3.37 + id: packagejson - name: Build and push uses: docker/build-push-action@v2 @@ -31,6 +35,6 @@ jobs: context: . platforms: linux/amd64 push: true - tags: coollabsio/coolify-test:latest + tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{ steps.packagejson.version }} cache-from: type=registry,ref=coollabsio/coolify-test:buildcache cache-to: type=registry,ref=coollabsio/coolify-test:buildcache,mode=max From 9d53bc09260e65196600a90c8e3bee5b4ab181ed Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 14:03:00 +0200 Subject: [PATCH 10/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 4c59cf715..263072877 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -35,6 +35,6 @@ jobs: context: . platforms: linux/amd64 push: true - tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{ steps.packagejson.version }} + tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{ steps.packagejson.outputs.version }} cache-from: type=registry,ref=coollabsio/coolify-test:buildcache cache-to: type=registry,ref=coollabsio/coolify-test:buildcache,mode=max From 259aeeb67a84d60a89ab11d2a3150904b54514ee Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 14:06:06 +0200 Subject: [PATCH 11/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 263072877..6ff5cdb81 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -25,9 +25,8 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Read package.json version - uses: dutscher/read-package-json-endpoint-actions@v1.3.37 - id: packagejson + name: Get current package version + uses: martinbeentjes/npm-get-version-action@v1.2.3 - name: Build and push uses: docker/build-push-action@v2 @@ -35,6 +34,6 @@ jobs: context: . platforms: linux/amd64 push: true - tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{ steps.packagejson.outputs.version }} + tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{ steps.package-version.outputs.current-version }} cache-from: type=registry,ref=coollabsio/coolify-test:buildcache cache-to: type=registry,ref=coollabsio/coolify-test:buildcache,mode=max From 3937cfec534a4e04867b0ec9925056d4915bbe43 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 14:08:24 +0200 Subject: [PATCH 12/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 6ff5cdb81..147b9cd5c 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -27,6 +27,7 @@ jobs: - name: Get current package version uses: martinbeentjes/npm-get-version-action@v1.2.3 + id: package-version - name: Build and push uses: docker/build-push-action@v2 @@ -34,6 +35,6 @@ jobs: context: . platforms: linux/amd64 push: true - tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{ steps.package-version.outputs.current-version }} + tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{steps.package-version.outputs.current-version}} cache-from: type=registry,ref=coollabsio/coolify-test:buildcache cache-to: type=registry,ref=coollabsio/coolify-test:buildcache,mode=max From 2cce1f84592db6dfc43b6d932e456df4be1f6929 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 14:11:46 +0200 Subject: [PATCH 13/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 147b9cd5c..656b5667e 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -33,7 +33,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 push: true tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{steps.package-version.outputs.current-version}} cache-from: type=registry,ref=coollabsio/coolify-test:buildcache From 4246d86694df981706211786091679b8f4f6dcfa Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 14:30:35 +0200 Subject: [PATCH 14/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 656b5667e..aa575bf04 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -1,9 +1,8 @@ name: release-coolify on: - push: - branches: - - 'gh-actions' + release: + types: published jobs: make-it-coolifyed: From 1ec03693d39265695eafbf80aca60f08561ae06d Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 4 May 2022 14:31:03 +0200 Subject: [PATCH 15/15] Update github-actions.yml --- .github/workflows/github-actions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index aa575bf04..ac49d22c3 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -34,6 +34,6 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: true - tags: coollabsio/coolify-test:latest,coollabsio/coolify-test:${{steps.package-version.outputs.current-version}} + tags: coollabsio/coolify:latest,coollabsio/coolify:${{steps.package-version.outputs.current-version}} cache-from: type=registry,ref=coollabsio/coolify-test:buildcache cache-to: type=registry,ref=coollabsio/coolify-test:buildcache,mode=max