From e3f4121228a8532dac3529efbe90f31987d6294a Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 05:04:47 +0000 Subject: [PATCH 01/45] add docker slim --- .github/workflows/deploy-image.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index 3582c4e84cd3..a31938c14c5e 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -2,14 +2,14 @@ name: Docker Image CI on: push: - branches: [ master ] + branches: [ master,add-dockerslim ] jobs: build: runs-on: ubuntu-latest - if: github.repository_owner == 'alshedivat' + #if: github.repository_owner == 'alshedivat' steps: - name: Checkout @@ -31,6 +31,18 @@ jobs: uses: docker/build-push-action@v4 with: context: . - push: true + push: false platforms: linux/amd64,linux/arm64/v8 - tags: amirpourmand/al-folio + tags: amirpourmand/al-folio:slim + + # Slim it! + - uses: kitabisa/docker-slim-action@v1 + env: + DSLIM_COMPOSE_FILE: docker-compose.yml + DSLIM_TARGET_COMPOSE_SVC: jekyll + with: + target: amirpourmand/al-folio:slim + tag: "slim" + + # Push to the registry + - run: docker image push amirpourmand/al-folio:slim \ No newline at end of file From 7b5f76685dec19afa3412413d456aef9f0c66476 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 05:57:36 +0000 Subject: [PATCH 02/45] add docker-slim --- .github/workflows/deploy-image.yml | 5 +++-- .github/workflows/docker-slim.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/docker-slim.yml diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index a31938c14c5e..7d7dee485536 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -2,14 +2,15 @@ name: Docker Image CI on: push: - branches: [ master,add-dockerslim ] + branches: [ master ] + jobs: build: runs-on: ubuntu-latest - #if: github.repository_owner == 'alshedivat' + if: github.repository_owner == 'alshedivat' steps: - name: Checkout diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml new file mode 100644 index 000000000000..bbea0e074acd --- /dev/null +++ b/.github/workflows/docker-slim.yml @@ -0,0 +1,26 @@ +name: Docker Slim + +# Only trigger, when the build workflow succeeded +# on: +# workflow_run: +# workflows: ["Docker Image CI"] +# types: +# - completed + +jobs: + build: + runs-on: ubuntu-latest + #if: github.repository_owner == 'alshedivat' + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - uses: kitabisa/docker-slim-action@v1 + env: + DSLIM_PULL: true + DSLIM_COMPOSE_FILE: docker-compose.yml + DSLIM_TARGET_COMPOSE_SVC: jekyll + with: + target: amirpourmand/al-folio:latest + tag: "slim" \ No newline at end of file From 28ba5bd95e85a581b888780a83d123b72c40287d Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 05:59:39 +0000 Subject: [PATCH 03/45] add on --- .github/workflows/docker-slim.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index bbea0e074acd..3d49042f7512 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -1,11 +1,12 @@ name: Docker Slim -# Only trigger, when the build workflow succeeded -# on: -# workflow_run: -# workflows: ["Docker Image CI"] -# types: -# - completed +#Only trigger, when the build workflow succeeded +on: + workflow_run: + workflows: ["Docker Image CI"] + types: + - completed + jobs: build: From 6dc4e97be7a02badda4bf6c3577e81441ea3be54 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:00:50 +0000 Subject: [PATCH 04/45] update --- .github/workflows/deploy-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index 7d7dee485536..72390716a629 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: push: - branches: [ master ] + branches: [ master,add-dockerslim ] jobs: From b302764fae6ec05adc3128e588f4c83d14dd5916 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:03:27 +0000 Subject: [PATCH 05/45] update condition --- .github/workflows/deploy-image.yml | 2 +- .github/workflows/docker-slim.yml | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index 72390716a629..7d7dee485536 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: push: - branches: [ master,add-dockerslim ] + branches: [ master ] jobs: diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 3d49042f7512..9b3c629e44d8 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -1,12 +1,16 @@ name: Docker Slim #Only trigger, when the build workflow succeeded -on: - workflow_run: - workflows: ["Docker Image CI"] - types: - - completed +# on: +# workflow_run: +# workflows: ["Docker Image CI"] +# types: +# - completed +on: + push: + branches: + - '**' jobs: build: From 98db1de2a4bc28e8682e849d612bed66dd26b35f Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:08:40 +0000 Subject: [PATCH 06/45] update --- .github/workflows/docker-slim.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 9b3c629e44d8..b968f62b1f6a 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -26,6 +26,7 @@ jobs: DSLIM_PULL: true DSLIM_COMPOSE_FILE: docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll + DSLIM_COMPOSE_WORKDIR: ${{ github.workspace }}/${{ github.repository }} with: target: amirpourmand/al-folio:latest tag: "slim" \ No newline at end of file From a1cf294e789d2262e714890a1c9bdc3797bf2b66 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:10:57 +0000 Subject: [PATCH 07/45] cd --- .github/workflows/docker-slim.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index b968f62b1f6a..fc948cf118b9 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -21,6 +21,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Set working directory + working-directory: ${{ github.workspace }} + - uses: kitabisa/docker-slim-action@v1 env: DSLIM_PULL: true From 74964d21104a94ef604a4557563c09594a24dcc6 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:13:04 +0000 Subject: [PATCH 08/45] cd . --- .github/workflows/docker-slim.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index fc948cf118b9..61c678ae33b3 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -21,10 +21,9 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set working directory - working-directory: ${{ github.workspace }} - - uses: kitabisa/docker-slim-action@v1 + working-directory: ${{ github.workspace }} + env: DSLIM_PULL: true DSLIM_COMPOSE_FILE: docker-compose.yml From 74ee6cc8078d0656e9f640077546c499cd546e5d Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:43:04 +0000 Subject: [PATCH 09/45] add working --- .github/workflows/docker-slim.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 61c678ae33b3..a182943b7352 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -16,14 +16,15 @@ jobs: build: runs-on: ubuntu-latest #if: github.repository_owner == 'alshedivat' - + defaults: + run: + shell: bash + working-directory: ${{ github.workspace }}/${{ github.repository }} steps: - name: Checkout uses: actions/checkout@v3 - uses: kitabisa/docker-slim-action@v1 - working-directory: ${{ github.workspace }} - env: DSLIM_PULL: true DSLIM_COMPOSE_FILE: docker-compose.yml From 70483f857d4d5c36a190950edb641155d42fb0ef Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:44:28 +0000 Subject: [PATCH 10/45] update --- .github/workflows/docker-slim.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index a182943b7352..ebbc08ea6884 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -16,15 +16,13 @@ jobs: build: runs-on: ubuntu-latest #if: github.repository_owner == 'alshedivat' - defaults: - run: - shell: bash - working-directory: ${{ github.workspace }}/${{ github.repository }} + steps: - name: Checkout uses: actions/checkout@v3 - uses: kitabisa/docker-slim-action@v1 + run: cd /home/runner/work/pourmand1376.github.io/pourmand1376.github.io env: DSLIM_PULL: true DSLIM_COMPOSE_FILE: docker-compose.yml From fd735591e67221a7dbd5fe84011ac481290484a6 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:45:05 +0000 Subject: [PATCH 11/45] update path --- .github/workflows/docker-slim.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index ebbc08ea6884..0414e78ea032 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -22,10 +22,9 @@ jobs: uses: actions/checkout@v3 - uses: kitabisa/docker-slim-action@v1 - run: cd /home/runner/work/pourmand1376.github.io/pourmand1376.github.io env: DSLIM_PULL: true - DSLIM_COMPOSE_FILE: docker-compose.yml + DSLIM_COMPOSE_FILE: /home/runner/work/pourmand1376.github.io/pourmand1376.github.io/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll DSLIM_COMPOSE_WORKDIR: ${{ github.workspace }}/${{ github.repository }} with: From 857dc14779abed870d31f586f63c30dd371d889d Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:46:45 +0000 Subject: [PATCH 12/45] update --- .github/workflows/docker-slim.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 0414e78ea032..1c2ca23013d7 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -24,9 +24,8 @@ jobs: - uses: kitabisa/docker-slim-action@v1 env: DSLIM_PULL: true - DSLIM_COMPOSE_FILE: /home/runner/work/pourmand1376.github.io/pourmand1376.github.io/docker-compose.yml + DSLIM_COMPOSE_FILE: ${{ github.workspace }}/${{ github.repository }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll - DSLIM_COMPOSE_WORKDIR: ${{ github.workspace }}/${{ github.repository }} with: target: amirpourmand/al-folio:latest tag: "slim" \ No newline at end of file From 317910b5c04db8a9bdc70e01a362616ed889db1b Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:47:46 +0000 Subject: [PATCH 13/45] update --- .github/workflows/docker-slim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 1c2ca23013d7..20544b4e067c 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -24,7 +24,7 @@ jobs: - uses: kitabisa/docker-slim-action@v1 env: DSLIM_PULL: true - DSLIM_COMPOSE_FILE: ${{ github.workspace }}/${{ github.repository }}/docker-compose.yml + DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll with: target: amirpourmand/al-folio:latest From 621358a99b82e82c2b04c5dc5c1847a136ecac54 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 06:53:59 +0000 Subject: [PATCH 14/45] add workdir --- .github/workflows/docker-slim.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 20544b4e067c..f624f89ef6c2 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -25,6 +25,8 @@ jobs: env: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml + DSLIM_RC_WORKDIR: ${{ github.workspace }} + DSLIM_COMPOSE_WORKDIR: ${{ github.workspace }} DSLIM_TARGET_COMPOSE_SVC: jekyll with: target: amirpourmand/al-folio:latest From 1e65066731eabdf5e4aa2196be88f2a9f7dcfe93 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 07:15:06 +0000 Subject: [PATCH 15/45] add --- .github/workflows/docker-slim.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index f624f89ef6c2..03e12b46e695 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -22,6 +22,7 @@ jobs: uses: actions/checkout@v3 - uses: kitabisa/docker-slim-action@v1 + working-directory: ${{ github.workspace }} env: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml From 73394a5c9e77cecc95c4b1e3465caf6c8f97e07d Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 07:16:13 +0000 Subject: [PATCH 16/45] update --- .github/workflows/docker-slim.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 03e12b46e695..6625bd1186c3 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -17,12 +17,15 @@ jobs: runs-on: ubuntu-latest #if: github.repository_owner == 'alshedivat' + defaults: + run: + working-directory: ${{ github.workspace }} + steps: - name: Checkout uses: actions/checkout@v3 - uses: kitabisa/docker-slim-action@v1 - working-directory: ${{ github.workspace }} env: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml From 0408602d0869e00f2c612422cb4eeace02887b3d Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 07:18:24 +0000 Subject: [PATCH 17/45] . --- .github/workflows/docker-slim.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 6625bd1186c3..243572857293 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -28,9 +28,8 @@ jobs: - uses: kitabisa/docker-slim-action@v1 env: DSLIM_PULL: true - DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml - DSLIM_RC_WORKDIR: ${{ github.workspace }} - DSLIM_COMPOSE_WORKDIR: ${{ github.workspace }} + #DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml + DSLIM_COMPOSE_FILE: docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll with: target: amirpourmand/al-folio:latest From 70159052ccca9ca4778dbf18a7584e7e1e97c032 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 07:41:17 +0000 Subject: [PATCH 18/45] add dockercompose --- .github/workflows/docker-slim.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 243572857293..918a548d229b 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -28,8 +28,7 @@ jobs: - uses: kitabisa/docker-slim-action@v1 env: DSLIM_PULL: true - #DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml - DSLIM_COMPOSE_FILE: docker-compose.yml + DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll with: target: amirpourmand/al-folio:latest From d1377b053da11ed776939b7b55eb8724eac6fa00 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 07:49:56 +0000 Subject: [PATCH 19/45] slim --- .github/workflows/docker-slim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 918a548d229b..dc4b5ed55c8c 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -31,5 +31,5 @@ jobs: DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll with: - target: amirpourmand/al-folio:latest + target: amirpourmand/al-folio tag: "slim" \ No newline at end of file From 46fad1b2056ec2a6027876030ea15242c01a084c Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 08:45:45 +0000 Subject: [PATCH 20/45] edit docker-compose --- .github/workflows/docker-slim.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index dc4b5ed55c8c..65168ad69714 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -25,6 +25,11 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: update docker-compose + shell: bash + run: | + sed -i "s/\.:/${{ github.workspace }}:/g" ${{ github.workspace }}/docker-compose.yml + - uses: kitabisa/docker-slim-action@v1 env: DSLIM_PULL: true From 63a596d54456baa6fcd283015aa673d8f734a60b Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 08:47:42 +0000 Subject: [PATCH 21/45] update --- .github/workflows/docker-slim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 65168ad69714..342c478918ac 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -28,7 +28,7 @@ jobs: - name: update docker-compose shell: bash run: | - sed -i "s/\.:/${{ github.workspace }}:/g" ${{ github.workspace }}/docker-compose.yml + sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml - uses: kitabisa/docker-slim-action@v1 env: From a74d5dbbd2fc5fd5adde5c71aeb46c533ade4cd2 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 08:51:13 +0000 Subject: [PATCH 22/45] http probe --- .github/workflows/docker-slim.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 342c478918ac..7d9e58862141 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -32,6 +32,7 @@ jobs: - uses: kitabisa/docker-slim-action@v1 env: + DSLIM_HTTP_PROBE: false DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll From 41711f5e772a822dd9ef1fc7e332bfe29b4daf87 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sun, 3 Sep 2023 08:56:01 +0000 Subject: [PATCH 23/45] path --- .github/workflows/docker-slim.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 7d9e58862141..066492981e7a 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -29,6 +29,7 @@ jobs: shell: bash run: | sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml + cat ${{ github.workspace }}/docker-compose.yml - uses: kitabisa/docker-slim-action@v1 env: From 9ff9f87aa9bfa95822df52f77f8c4dea507fb962 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 12 Sep 2023 10:33:56 +0330 Subject: [PATCH 24/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 066492981e7a..afadd3e595e6 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -33,10 +33,10 @@ jobs: - uses: kitabisa/docker-slim-action@v1 env: - DSLIM_HTTP_PROBE: false + #DSLIM_HTTP_PROBE: false DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll with: target: amirpourmand/al-folio - tag: "slim" \ No newline at end of file + tag: "slim" From 62de9c43b641cad430170a91bccdfa93009f8b87 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 13:48:53 +0330 Subject: [PATCH 25/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index afadd3e595e6..9ad21700c174 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -37,6 +37,7 @@ jobs: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll + DSLIM_CONTINUE_AFTER: 100 with: target: amirpourmand/al-folio tag: "slim" From 345ade0a7c5106a727bdcda81468633715d16efd Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 13:57:25 +0330 Subject: [PATCH 26/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 9ad21700c174..6a838d1a3b59 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -37,7 +37,7 @@ jobs: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll - DSLIM_CONTINUE_AFTER: 100 + DSLIM_CONTINUE_AFTER: 1 with: target: amirpourmand/al-folio tag: "slim" From 36e4069056796b9b12f99159f56f9117483cb60d Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 14:03:39 +0330 Subject: [PATCH 27/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 6a838d1a3b59..cbe73ba16bd1 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -37,7 +37,7 @@ jobs: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll - DSLIM_CONTINUE_AFTER: 1 + DSLIM_CONTINUE_AFTER: signal with: target: amirpourmand/al-folio tag: "slim" From db86ab85cdd0d16f285c205560ae81f0925eb4dc Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 14:08:45 +0330 Subject: [PATCH 28/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index cbe73ba16bd1..4100d742e3ee 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -36,8 +36,8 @@ jobs: #DSLIM_HTTP_PROBE: false DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml - DSLIM_TARGET_COMPOSE_SVC: jekyll - DSLIM_CONTINUE_AFTER: signal + DSLIM_TARGET_COMPOSE_SVC: 'jekyll' + DSLIM_CONTINUE_AFTER: 'signal' with: target: amirpourmand/al-folio tag: "slim" From 66c2c5c50b3ad44f4accc59f9cdb54f697a949db Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 14:19:32 +0330 Subject: [PATCH 29/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 4100d742e3ee..0c3acac66a5b 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -31,13 +31,12 @@ jobs: sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml cat ${{ github.workspace }}/docker-compose.yml - - uses: kitabisa/docker-slim-action@v1 + - uses: pourmand1376/docker-slim-action@v1.2 env: #DSLIM_HTTP_PROBE: false DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: 'jekyll' - DSLIM_CONTINUE_AFTER: 'signal' with: target: amirpourmand/al-folio tag: "slim" From 0d1c2801f1be97e18d79c3899ad835e0ef242c4c Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 14:21:35 +0330 Subject: [PATCH 30/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 0c3acac66a5b..de2339623825 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -36,7 +36,8 @@ jobs: #DSLIM_HTTP_PROBE: false DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml - DSLIM_TARGET_COMPOSE_SVC: 'jekyll' + DSLIM_TARGET_COMPOSE_SVC: jekyll + DSLIM_CONTINUE_AFTER: signal with: target: amirpourmand/al-folio tag: "slim" From 4b663a3236f681f3d928764481e3806fbb3e4563 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 14:25:04 +0330 Subject: [PATCH 31/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index de2339623825..1a801317e7fe 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -33,7 +33,6 @@ jobs: - uses: pourmand1376/docker-slim-action@v1.2 env: - #DSLIM_HTTP_PROBE: false DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll From 2220d9daef713ae2ab1e67bb2e8bacbf6c85bbee Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 20:39:26 +0330 Subject: [PATCH 32/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 1a801317e7fe..7c819a67b167 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -31,7 +31,7 @@ jobs: sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml cat ${{ github.workspace }}/docker-compose.yml - - uses: pourmand1376/docker-slim-action@v1.2 + - uses: kitabisa/docker-slim-action@v1.0.3 env: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml From e9442f478f3ad5c4821820eceb642b62e90debdb Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 21:10:46 +0330 Subject: [PATCH 33/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 7c819a67b167..49519be1fbcd 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -25,6 +25,12 @@ jobs: - name: Checkout uses: actions/checkout@v3 + - name: Login + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: update docker-compose shell: bash run: | @@ -36,7 +42,9 @@ jobs: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll - DSLIM_CONTINUE_AFTER: signal with: target: amirpourmand/al-folio tag: "slim" + + # Push to the registry + - run: docker image push amirpourmand/al-folio:slim From 60f4275e93f29db7381bbe1c1cbd61739c8e61d7 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Mon, 2 Oct 2023 21:15:41 +0330 Subject: [PATCH 34/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 49519be1fbcd..d35cb4b18e60 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -42,6 +42,7 @@ jobs: DSLIM_PULL: true DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll + DSLIM_CONTINUE_AFTER: signal with: target: amirpourmand/al-folio tag: "slim" From 430194fa93c9267ae8e3b0cb80fb630850deca6f Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 11:19:56 +0330 Subject: [PATCH 35/45] Update deploy-image.yml --- .github/workflows/deploy-image.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index 7d7dee485536..a1bd3f7ccf03 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -32,18 +32,24 @@ jobs: uses: docker/build-push-action@v4 with: context: . - push: false + push: true platforms: linux/amd64,linux/arm64/v8 tags: amirpourmand/al-folio:slim - # Slim it! - - uses: kitabisa/docker-slim-action@v1 + - name: update docker-compose + shell: bash + run: | + sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml + cat ${{ github.workspace }}/docker-compose.yml + + - uses: kitabisa/docker-slim-action@v1.0.3 env: - DSLIM_COMPOSE_FILE: docker-compose.yml + DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll + DSLIM_CONTINUE_AFTER: signal with: - target: amirpourmand/al-folio:slim + target: amirpourmand/al-folio tag: "slim" # Push to the registry - - run: docker image push amirpourmand/al-folio:slim \ No newline at end of file + - run: docker image push amirpourmand/al-folio:slim From 0114280d22af604f78b61affc0f05d132e152f84 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 11:20:36 +0330 Subject: [PATCH 36/45] Update deploy-image.yml --- .github/workflows/deploy-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index a1bd3f7ccf03..b421b24e35e6 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -34,7 +34,7 @@ jobs: context: . push: true platforms: linux/amd64,linux/arm64/v8 - tags: amirpourmand/al-folio:slim + tags: amirpourmand/al-folio - name: update docker-compose shell: bash From 159df2141eb37d5a8e684add11a92f7cc6b39347 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 11:21:53 +0330 Subject: [PATCH 37/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index d35cb4b18e60..14012fe1da8c 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -15,7 +15,7 @@ on: jobs: build: runs-on: ubuntu-latest - #if: github.repository_owner == 'alshedivat' + if: github.repository_owner == 'alshedivat' defaults: run: From 138b129f15fa5078416da614a1f771ce3516b67b Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 11:22:08 +0330 Subject: [PATCH 38/45] Update deploy-image.yml --- .github/workflows/deploy-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index b421b24e35e6..cd4280a647e6 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest - if: github.repository_owner == 'alshedivat' + #if: github.repository_owner == 'alshedivat' steps: - name: Checkout From 5363ee0796aa1eeca3d735c74aeed9d591d4be3f Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 11:23:32 +0330 Subject: [PATCH 39/45] Update deploy-image.yml --- .github/workflows/deploy-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index cd4280a647e6..714d966b744e 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -2,7 +2,7 @@ name: Docker Image CI on: push: - branches: [ master ] + branches: [ master, add-dockerslim ] jobs: From 6f9addf2df5ae5e18ee56d791ca972db109a1962 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 13:02:42 +0330 Subject: [PATCH 40/45] Update deploy-image.yml --- .github/workflows/deploy-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index 714d966b744e..d86cd29f4a92 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -48,7 +48,7 @@ jobs: DSLIM_TARGET_COMPOSE_SVC: jekyll DSLIM_CONTINUE_AFTER: signal with: - target: amirpourmand/al-folio + target: amirpourmand/al-folio:latest tag: "slim" # Push to the registry From 8ff597a93c4965cd3884b133fb232b3d87fef2bb Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 13:42:02 +0330 Subject: [PATCH 41/45] Update deploy-image.yml --- .github/workflows/deploy-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml index d86cd29f4a92..fa1866822b1e 100644 --- a/.github/workflows/deploy-image.yml +++ b/.github/workflows/deploy-image.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest - #if: github.repository_owner == 'alshedivat' + if: github.repository_owner == 'alshedivat' steps: - name: Checkout From 85e3f873f3e28556209ac61250b62d035fa3d06b Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Tue, 3 Oct 2023 13:44:40 +0330 Subject: [PATCH 42/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index 14012fe1da8c..b59d9e15ba9b 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -15,7 +15,7 @@ on: jobs: build: runs-on: ubuntu-latest - if: github.repository_owner == 'alshedivat' + #if: github.repository_owner == 'alshedivat' defaults: run: @@ -43,6 +43,7 @@ jobs: DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll DSLIM_CONTINUE_AFTER: signal + DSLIM_IMAGE_BUILD_ARCH: linux/amd64 with: target: amirpourmand/al-folio tag: "slim" From b274d687dd88c423bd72fada8cd4d2058a021ae7 Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sat, 7 Oct 2023 12:04:54 +0330 Subject: [PATCH 43/45] Update docker-slim.yml --- .github/workflows/docker-slim.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-slim.yml b/.github/workflows/docker-slim.yml index b59d9e15ba9b..54a3c19026d7 100644 --- a/.github/workflows/docker-slim.yml +++ b/.github/workflows/docker-slim.yml @@ -1,21 +1,21 @@ name: Docker Slim #Only trigger, when the build workflow succeeded -# on: -# workflow_run: -# workflows: ["Docker Image CI"] -# types: -# - completed +on: + workflow_run: + workflows: ["Docker Image CI"] + types: + - completed -on: - push: - branches: - - '**' +# on: +# push: +# branches: +# - 'master' jobs: build: runs-on: ubuntu-latest - #if: github.repository_owner == 'alshedivat' + if: github.repository_owner == 'alshedivat' defaults: run: @@ -43,7 +43,6 @@ jobs: DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml DSLIM_TARGET_COMPOSE_SVC: jekyll DSLIM_CONTINUE_AFTER: signal - DSLIM_IMAGE_BUILD_ARCH: linux/amd64 with: target: amirpourmand/al-folio tag: "slim" From 584c9015ac7a9338f530ca9d5b9ee9573eb968da Mon Sep 17 00:00:00 2001 From: Amir Pourmand Date: Sat, 7 Oct 2023 12:06:16 +0330 Subject: [PATCH 44/45] Delete .github/workflows/deploy-image.yml --- .github/workflows/deploy-image.yml | 55 ------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 .github/workflows/deploy-image.yml diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml deleted file mode 100644 index fa1866822b1e..000000000000 --- a/.github/workflows/deploy-image.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ master, add-dockerslim ] - - -jobs: - - build: - - runs-on: ubuntu-latest - if: github.repository_owner == 'alshedivat' - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Buildx - uses: docker/setup-buildx-action@v2 - - - name: Login - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push - uses: docker/build-push-action@v4 - with: - context: . - push: true - platforms: linux/amd64,linux/arm64/v8 - tags: amirpourmand/al-folio - - - name: update docker-compose - shell: bash - run: | - sed -i "s|\.:|${{ github.workspace }}:|g" ${{ github.workspace }}/docker-compose.yml - cat ${{ github.workspace }}/docker-compose.yml - - - uses: kitabisa/docker-slim-action@v1.0.3 - env: - DSLIM_COMPOSE_FILE: ${{ github.workspace }}/docker-compose.yml - DSLIM_TARGET_COMPOSE_SVC: jekyll - DSLIM_CONTINUE_AFTER: signal - with: - target: amirpourmand/al-folio:latest - tag: "slim" - - # Push to the registry - - run: docker image push amirpourmand/al-folio:slim From e5eed5b2908c068e1bbed0a0798d75fce23f6b37 Mon Sep 17 00:00:00 2001 From: "a.pourmand" Date: Sat, 7 Oct 2023 12:17:57 +0330 Subject: [PATCH 45/45] revert deploy-image --- .github/workflows/deploy-image.yml | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 .github/workflows/deploy-image.yml diff --git a/.github/workflows/deploy-image.yml b/.github/workflows/deploy-image.yml new file mode 100644 index 000000000000..3582c4e84cd3 --- /dev/null +++ b/.github/workflows/deploy-image.yml @@ -0,0 +1,36 @@ +name: Docker Image CI + +on: + push: + branches: [ master ] + +jobs: + + build: + + runs-on: ubuntu-latest + if: github.repository_owner == 'alshedivat' + + steps: + - name: Checkout + uses: actions/checkout@v3 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and push + uses: docker/build-push-action@v4 + with: + context: . + push: true + platforms: linux/amd64,linux/arm64/v8 + tags: amirpourmand/al-folio