From 8f54f08afbd00d92d5c196ea59b227b9b0f669c3 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 19:35:18 +0300 Subject: [PATCH 01/24] actions-add --- .gitea/workflows/build.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .gitea/workflows/build.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..8900824 --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,34 @@ +name: Actions Build Docker Image +run-name: ${{ gitea.actor }} is building new image 🚀 +on: [push] + +jobs: + Explore-Gitea-Actions: + runs-on: soaska + steps: + - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." + - run: apk add --no-cache nodejs + - name: Check out repository code + uses: actions/checkout@v3 + - name: List files in the repository + run: | + ls ${{ gitea.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." + - name: Install Docker + run: | + apk add --no-cache docker + service docker start + docker info + - name: Build Dockerfile + run: | + docker build -t myimage . + - name: Export Docker image to tar.gz + run: | + docker save myimage | gzip > myimage.tar.gz + - name: Upload Docker image to Gitea + run: | + - name: Upload Docker image to Gitea + run: | + package_name=$(basename ${{ github.repository }}) + commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@myimage.tar.gz" ${{ secrets.gitea_upload_url }}/packages/${{ package_name }}/versions/${{ commit_date }} -- 2.45.2 From ce1a04214db8c8afe3f9a93b5194cb396a8c8573 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 19:42:56 +0300 Subject: [PATCH 02/24] docker daemon fix --- .gitea/workflows/build.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8900824..0b8f1a6 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,8 +17,11 @@ jobs: - name: Install Docker run: | apk add --no-cache docker - service docker start - docker info + - name: Start Docker service + run: | + dockerd & + sleep 5 + docker info - name: Build Dockerfile run: | docker build -t myimage . -- 2.45.2 From 15143b1ab8eb8a8a0f8a412c2856870b73f066ed Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 19:44:37 +0300 Subject: [PATCH 03/24] typo... --- .gitea/workflows/build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 0b8f1a6..365e7fb 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -17,11 +17,11 @@ jobs: - name: Install Docker run: | apk add --no-cache docker - - name: Start Docker service - run: | - dockerd & - sleep 5 - docker info + - name: Start Docker service + run: | + dockerd & + sleep 5 + docker info - name: Build Dockerfile run: | docker build -t myimage . @@ -32,6 +32,6 @@ jobs: run: | - name: Upload Docker image to Gitea run: | - package_name=$(basename ${{ github.repository }}) + package_name=$(basename ${{ gitea.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@myimage.tar.gz" ${{ secrets.gitea_upload_url }}/packages/${{ package_name }}/versions/${{ commit_date }} -- 2.45.2 From 73995ffaf7af6f858a5200017dfe8cfc03abbc5b Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 19:48:09 +0300 Subject: [PATCH 04/24] Fix bug in login functionality --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 365e7fb..7c729d8 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -34,4 +34,4 @@ jobs: run: | package_name=$(basename ${{ gitea.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@myimage.tar.gz" ${{ secrets.gitea_upload_url }}/packages/${{ package_name }}/versions/${{ commit_date }} + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@myimage.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} -- 2.45.2 From 5f066a02e3bd27d78d8ba48443f8dc555343a012 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 19:50:13 +0300 Subject: [PATCH 05/24] fix? --- .gitea/workflows/build.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 7c729d8..05645b5 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -10,9 +10,6 @@ jobs: - run: apk add --no-cache nodejs - name: Check out repository code uses: actions/checkout@v3 - - name: List files in the repository - run: | - ls ${{ gitea.workspace }} - run: echo "🍏 This job's status is ${{ job.status }}." - name: Install Docker run: | -- 2.45.2 From 38a68cb436c5d047e13ab4f5f6cc40b0e458453b Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 19:54:46 +0300 Subject: [PATCH 06/24] Update Docker image name and file in build.yaml --- .gitea/workflows/build.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 05645b5..f8612ba 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -21,14 +21,13 @@ jobs: docker info - name: Build Dockerfile run: | - docker build -t myimage . + docker build -t sd_telegram . - name: Export Docker image to tar.gz run: | - docker save myimage | gzip > myimage.tar.gz + docker save sd_telegram | gzip > sd_telegram.tar.gz - name: Upload Docker image to Gitea run: | - name: Upload Docker image to Gitea run: | - package_name=$(basename ${{ gitea.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@myimage.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ sd_telegram_image }}/versions/${{ commit_date }} -- 2.45.2 From 4ab7a4621db47c44f72ce116eac76a1ffe112d2d Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 19:56:54 +0300 Subject: [PATCH 07/24] Update build.yaml to use simplified 'on' syntax --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index f8612ba..a136546 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,6 +1,6 @@ name: Actions Build Docker Image run-name: ${{ gitea.actor }} is building new image 🚀 -on: [push] +on: push jobs: Explore-Gitea-Actions: -- 2.45.2 From e0737b04dc8bc4fb353477065e4aa289fdde2e55 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:06:09 +0300 Subject: [PATCH 08/24] Refactor build.yaml file --- .gitea/workflows/build.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index a136546..8002908 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -3,14 +3,13 @@ run-name: ${{ gitea.actor }} is building new image 🚀 on: push jobs: - Explore-Gitea-Actions: + build: runs-on: soaska steps: - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - run: apk add --no-cache nodejs - name: Check out repository code uses: actions/checkout@v3 - - run: echo "🍏 This job's status is ${{ job.status }}." - name: Install Docker run: | apk add --no-cache docker -- 2.45.2 From a72536e38fd6beef9d8838afcbb9bda9d08a164c Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:24:39 +0300 Subject: [PATCH 09/24] Add Gitea Actions workflow to build and upload Docker image --- .gitea/workflows/build.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8002908..db65501 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -1,15 +1,19 @@ name: Actions Build Docker Image run-name: ${{ gitea.actor }} is building new image 🚀 -on: push +on: [push] jobs: - build: + Explore-Gitea-Actions: runs-on: soaska steps: - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - run: apk add --no-cache nodejs - name: Check out repository code uses: actions/checkout@v3 + - name: List files in the repository + run: | + ls ${{ gitea.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." - name: Install Docker run: | apk add --no-cache docker @@ -17,16 +21,17 @@ jobs: run: | dockerd & sleep 5 - docker info + docker info - name: Build Dockerfile run: | - docker build -t sd_telegram . + docker build -t sd_telegram . - name: Export Docker image to tar.gz run: | - docker save sd_telegram | gzip > sd_telegram.tar.gz + docker save sd_telegram | gzip > sd_telegram.tar.gz - name: Upload Docker image to Gitea run: | - name: Upload Docker image to Gitea run: | + package_name=$(basename ${{ github.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ sd_telegram_image }}/versions/${{ commit_date }} + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} -- 2.45.2 From 8288607aaad1336b0a82fc8cf85485fd4e43942b Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:26:14 +0300 Subject: [PATCH 10/24] Remove unnecessary echo statement --- .gitea/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index db65501..27081ad 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,7 +13,6 @@ jobs: - name: List files in the repository run: | ls ${{ gitea.workspace }} - - run: echo "🍏 This job's status is ${{ job.status }}." - name: Install Docker run: | apk add --no-cache docker -- 2.45.2 From a2e6c21146d19d09f28302e0147cc372ad3f804e Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:28:15 +0300 Subject: [PATCH 11/24] Update build.yaml with Docker image name and upload URL --- .gitea/workflows/build.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 27081ad..8caf89b 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -13,24 +13,25 @@ jobs: - name: List files in the repository run: | ls ${{ gitea.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." - name: Install Docker run: | apk add --no-cache docker - - name: Start Docker service - run: | - dockerd & - sleep 5 - docker info + - name: Start Docker service + run: | + dockerd & + sleep 5 + docker info - name: Build Dockerfile run: | - docker build -t sd_telegram . + docker build -t myimage . - name: Export Docker image to tar.gz run: | - docker save sd_telegram | gzip > sd_telegram.tar.gz + docker save myimage | gzip > myimage.tar.gz - name: Upload Docker image to Gitea run: | - name: Upload Docker image to Gitea run: | package_name=$(basename ${{ github.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@myimage.tar.gz" ${{ secrets.gitea_upload_url }}/packages/${{ package_name }}/versions/${{ commit_date }} -- 2.45.2 From bb04cbe38c60102a34feda5c4049956c06e7e4fa Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:30:36 +0300 Subject: [PATCH 12/24] Update Docker image name and upload URL --- .gitea/workflows/build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8caf89b..60acb9d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -24,14 +24,14 @@ jobs: docker info - name: Build Dockerfile run: | - docker build -t myimage . + docker build -t sd_telegram . - name: Export Docker image to tar.gz run: | - docker save myimage | gzip > myimage.tar.gz + docker save sd_telegram | gzip > sd_telegram.tar.gz - name: Upload Docker image to Gitea run: | - name: Upload Docker image to Gitea run: | package_name=$(basename ${{ github.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@myimage.tar.gz" ${{ secrets.gitea_upload_url }}/packages/${{ package_name }}/versions/${{ commit_date }} + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} -- 2.45.2 From 1e4d1e5143e92ce211195abc55980fb92e3923cc Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:34:24 +0300 Subject: [PATCH 13/24] Update build.yaml to include Gitea upload URL --- .gitea/workflows/build.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 60acb9d..56e161f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -27,11 +27,9 @@ jobs: docker build -t sd_telegram . - name: Export Docker image to tar.gz run: | - docker save sd_telegram | gzip > sd_telegram.tar.gz + docker save sd_telegram | gzip > sd_telegram.tar.gz ${{ secrets.gitea_upload_url }} - name: Upload Docker image to Gitea run: | - - name: Upload Docker image to Gitea - run: | - package_name=$(basename ${{ github.repository }}) - commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} + package_name=$(basename ${{ github.repository }}) + commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} -- 2.45.2 From eff33da4e82d4e4898d8ee6b907b6e9fed2cb8bc Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:37:59 +0300 Subject: [PATCH 14/24] Update build.yaml to upload Docker image to soaska.ru --- .gitea/workflows/build.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 56e161f..dc0e040 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -27,9 +27,11 @@ jobs: docker build -t sd_telegram . - name: Export Docker image to tar.gz run: | - docker save sd_telegram | gzip > sd_telegram.tar.gz ${{ secrets.gitea_upload_url }} - - name: Upload Docker image to Gitea + docker save sd_telegram | gzip > sd_telegram.tar.gz + - name: Add new variables run: | package_name=$(basename ${{ github.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }} + - name: Upload Docker image to soaska.ru + run: | + curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }}/sd_telegram.tar.gz -- 2.45.2 From 39e5270d6fc5b39eb2198fb0915da54de710cb77 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:43:55 +0300 Subject: [PATCH 15/24] Update curl command to use --user flag for authentication --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index dc0e040..8a84bf7 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -34,4 +34,4 @@ jobs: commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - name: Upload Docker image to soaska.ru run: | - curl -u ${{ secrets.username }}:${{ secrets.password }} -X POST -F "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }}/sd_telegram.tar.gz + curl --user ${{ secrets.username }}:${{ secrets.password }} --upload-file "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }}/sd_telegram.tar.gz -- 2.45.2 From bcf390e7bc4836a601169bcf04e697a6290add90 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:46:25 +0300 Subject: [PATCH 16/24] Update Docker image upload URL --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 8a84bf7..59e154f 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -34,4 +34,4 @@ jobs: commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - name: Upload Docker image to soaska.ru run: | - curl --user ${{ secrets.username }}:${{ secrets.password }} --upload-file "file=@sd_telegram.tar.gz" https://soaska.ru/packages/${{ package_name }}/versions/${{ commit_date }}/sd_telegram.tar.gz + curl --user ${{ secrets.username }}:${{ secrets.password }} --upload-file "file=@sd_telegram.tar.gz" https://soaska.ru/api/packages/${{ secrets.username }}/generic/${{ package_name }}/${{ commit_date }}/sd_telegram.tar.gz -- 2.45.2 From 59ecf648f191fd3a1c3fac9a4f230c5f7c024247 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:53:08 +0300 Subject: [PATCH 17/24] Add curl package and install nodejs --- .gitea/workflows/build.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 59e154f..70664f3 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -7,7 +7,10 @@ jobs: runs-on: soaska steps: - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - run: apk add --no-cache nodejs + - name: Install required packages + run: | + apk add --no-cache curl + apk add --no-cache nodejs - name: Check out repository code uses: actions/checkout@v3 - name: List files in the repository -- 2.45.2 From fb6a939733115b3ca09917e3f3b6e7d8d507fd5d Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:55:14 +0300 Subject: [PATCH 18/24] Update file upload command in build.yaml --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 70664f3..6274ab1 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -37,4 +37,4 @@ jobs: commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - name: Upload Docker image to soaska.ru run: | - curl --user ${{ secrets.username }}:${{ secrets.password }} --upload-file "file=@sd_telegram.tar.gz" https://soaska.ru/api/packages/${{ secrets.username }}/generic/${{ package_name }}/${{ commit_date }}/sd_telegram.tar.gz + curl --user ${{ secrets.username }}:${{ secrets.password }} --upload-file sd_telegram.tar.gz https://soaska.ru/api/packages/${{ secrets.username }}/generic/${{ package_name }}/${{ commit_date }}/sd_telegram.tar.gz -- 2.45.2 From 692f3e3bcf9ab3be811089b255d5a4672917d675 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 20:57:54 +0300 Subject: [PATCH 19/24] Update curl command in build.yaml --- .gitea/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 6274ab1..090d50d 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -37,4 +37,4 @@ jobs: commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - name: Upload Docker image to soaska.ru run: | - curl --user ${{ secrets.username }}:${{ secrets.password }} --upload-file sd_telegram.tar.gz https://soaska.ru/api/packages/${{ secrets.username }}/generic/${{ package_name }}/${{ commit_date }}/sd_telegram.tar.gz + curl -v --user ${{ secrets.username }}:${{ secrets.password }} --upload-file sd_telegram.tar.gz https://soaska.ru/api/packages/${{ secrets.username }}/generic/${{ package_name }}/${{ commit_date }}/sd_telegram.tar.gz -- 2.45.2 From b02eb4806e00f01abeeaad499284f9ad86d91314 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 21:06:02 +0300 Subject: [PATCH 20/24] Update build.yaml to install Node.js and push Docker image to soaska.ru --- .gitea/workflows/build.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 090d50d..327d133 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -7,9 +7,8 @@ jobs: runs-on: soaska steps: - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." - - name: Install required packages + - name: Install Node.js run: | - apk add --no-cache curl apk add --no-cache nodejs - name: Check out repository code uses: actions/checkout@v3 @@ -37,4 +36,8 @@ jobs: commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - name: Upload Docker image to soaska.ru run: | - curl -v --user ${{ secrets.username }}:${{ secrets.password }} --upload-file sd_telegram.tar.gz https://soaska.ru/api/packages/${{ secrets.username }}/generic/${{ package_name }}/${{ commit_date }}/sd_telegram.tar.gz + docker login -u ${{ secrets.username }} -p ${{ secrets.password }} soaska.ru + docker tag sd_telegram soaska.ru/$package_name:$commit_date + docker tag sd_telegram soaska.ru/$package_name:latest + docker push soaska.ru/$package_name:$commit_date + docker push soaska.ru/$package_name:latest \ No newline at end of file -- 2.45.2 From 6f124d5d5d2560a3c89f33d5b5683934cf6692aa Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 21:07:03 +0300 Subject: [PATCH 21/24] Remove Docker image export step from build workflow --- .gitea/workflows/build.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 327d133..7dd4f09 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -27,9 +27,6 @@ jobs: - name: Build Dockerfile run: | docker build -t sd_telegram . - - name: Export Docker image to tar.gz - run: | - docker save sd_telegram | gzip > sd_telegram.tar.gz - name: Add new variables run: | package_name=$(basename ${{ github.repository }}) -- 2.45.2 From bb00bb07a5ed188bf56814b82684ebd53884b6dd Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 21:09:19 +0300 Subject: [PATCH 22/24] Update Docker image tags --- .gitea/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index 7dd4f09..c948e8e 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -34,7 +34,7 @@ jobs: - name: Upload Docker image to soaska.ru run: | docker login -u ${{ secrets.username }} -p ${{ secrets.password }} soaska.ru - docker tag sd_telegram soaska.ru/$package_name:$commit_date - docker tag sd_telegram soaska.ru/$package_name:latest - docker push soaska.ru/$package_name:$commit_date - docker push soaska.ru/$package_name:latest \ No newline at end of file + docker tag sd_telegram soaska.ru/soaska/$package_name:$commit_date + docker tag sd_telegram soaska.ru/soaska/$package_name:latest + docker push soaska.ru/soaska/$package_name:$commit_date + docker push soaska.ru/soaska/$package_name:latest \ No newline at end of file -- 2.45.2 From a5f81172d679ce1ad1e62f8d8a2e19445b3968a6 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 21:10:53 +0300 Subject: [PATCH 23/24] Add package name and commit date to build script --- .gitea/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index c948e8e..d34d135 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -31,6 +31,7 @@ jobs: run: | package_name=$(basename ${{ github.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') + echo "package_name=$package_name, commit_date=$commit_date" - name: Upload Docker image to soaska.ru run: | docker login -u ${{ secrets.username }} -p ${{ secrets.password }} soaska.ru -- 2.45.2 From 7529b873e4f98ee26e4d5fcbc3ae7e9c399dd9a8 Mon Sep 17 00:00:00 2001 From: Alex Borisov <79996669747@ya.ru> Date: Mon, 29 Jan 2024 21:23:44 +0300 Subject: [PATCH 24/24] Update build.yaml to include package name and commit date --- .gitea/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml index d34d135..7612616 100644 --- a/.gitea/workflows/build.yaml +++ b/.gitea/workflows/build.yaml @@ -31,9 +31,11 @@ jobs: run: | package_name=$(basename ${{ github.repository }}) commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') - echo "package_name=$package_name, commit_date=$commit_date" + echo "package_name=$package_name, commit_date=$commit_date" - name: Upload Docker image to soaska.ru run: | + package_name=$(basename ${{ github.repository }}) + commit_date=$(git log -1 --format=%cd --date=format:'%Y%m%d%H%M%S') docker login -u ${{ secrets.username }} -p ${{ secrets.password }} soaska.ru docker tag sd_telegram soaska.ru/soaska/$package_name:$commit_date docker tag sd_telegram soaska.ru/soaska/$package_name:latest -- 2.45.2