From c132ab9119726fd1ffd285a6cfedf36c65af391b Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:19:59 +0100 Subject: [PATCH 01/20] Ajouter .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 .woodpecker/build-image.yaml diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml new file mode 100644 index 0000000..0c88b55 --- /dev/null +++ b/.woodpecker/build-image.yaml @@ -0,0 +1,14 @@ +when: + - event: push + branch: main + +publish: + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x + repo: gargoton.petite-maison-orange.fr//image/calibre-web + registry: gargoton.petite-maison-orange.fr + tags: latest + username: ${CI_REPO_OWNER} + password: + from_secret: cb_token From 88afc47893315930345fd6b19d2decb2e050a68c Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:21:36 +0100 Subject: [PATCH 02/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index 0c88b55..6fcd253 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -2,13 +2,14 @@ when: - event: push branch: main -publish: - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm64/v8,linux/ppc64le,linux/riscv64,linux/s390x - repo: gargoton.petite-maison-orange.fr//image/calibre-web - registry: gargoton.petite-maison-orange.fr - tags: latest - username: ${CI_REPO_OWNER} - password: - from_secret: cb_token +steps: + publish: + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/amd64 + repo: gargoton.petite-maison-orange.fr//image/calibre-web + registry: gargoton.petite-maison-orange.fr + tags: latest + username: ${CI_REPO_OWNER} + password: + from_secret: cb_token From 9c922edfef5aff63ab74c6424fc67e3d1f85f15f Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:23:13 +0100 Subject: [PATCH 03/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index 6fcd253..f9c2394 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -1,15 +1,10 @@ -when: - - event: push - branch: main - -steps: - publish: - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/amd64 - repo: gargoton.petite-maison-orange.fr//image/calibre-web - registry: gargoton.petite-maison-orange.fr - tags: latest - username: ${CI_REPO_OWNER} - password: - from_secret: cb_token +publish: + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/amd64 + repo: gargoton.petite-maison-orange.fr//image/calibre-web + registry: gargoton.petite-maison-orange.fr + tags: latest + username: ${CI_REPO_OWNER} + password: + from_secret: cb_token From 6af157571fd7404a4b4a9fc3db61272ce69e0b49 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:25:05 +0100 Subject: [PATCH 04/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index f9c2394..f48c56e 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -1,10 +1,11 @@ -publish: - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/amd64 - repo: gargoton.petite-maison-orange.fr//image/calibre-web - registry: gargoton.petite-maison-orange.fr - tags: latest - username: ${CI_REPO_OWNER} - password: - from_secret: cb_token +pipeline: + publish: + image: woodpeckerci/plugin-docker-buildx + settings: + platforms: linux/amd64 + repo: gargoton.petite-maison-orange.fr//image/calibre-web + registry: gargoton.petite-maison-orange.fr + tags: latest + username: ${CI_REPO_OWNER} + password: + from_secret: cb_token From 50950b687a24977d57f0b25c7a9ad83bb4038692 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:27:07 +0100 Subject: [PATCH 05/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index f48c56e..f8d1939 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -1,4 +1,4 @@ -pipeline: +steps: publish: image: woodpeckerci/plugin-docker-buildx settings: @@ -8,4 +8,4 @@ pipeline: tags: latest username: ${CI_REPO_OWNER} password: - from_secret: cb_token + from_secret: eric_token From 2d9ba62e274fadd3ab11d881358ac5311760c690 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:31:47 +0100 Subject: [PATCH 06/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index f8d1939..7b1a5f7 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -8,4 +8,4 @@ steps: tags: latest username: ${CI_REPO_OWNER} password: - from_secret: eric_token + from_secret: eric-token From 7a183ab894449791f960768e618a26f4b08faf32 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:33:47 +0100 Subject: [PATCH 07/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index 7b1a5f7..f8d1939 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -8,4 +8,4 @@ steps: tags: latest username: ${CI_REPO_OWNER} password: - from_secret: eric-token + from_secret: eric_token From 1666ff8ce041a827109cedc781934005d1a65a8d Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:39:03 +0100 Subject: [PATCH 08/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index f8d1939..a0529a1 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -3,7 +3,7 @@ steps: image: woodpeckerci/plugin-docker-buildx settings: platforms: linux/amd64 - repo: gargoton.petite-maison-orange.fr//image/calibre-web + repo: gargoton.petite-maison-orange.fr/image/calibre-web registry: gargoton.petite-maison-orange.fr tags: latest username: ${CI_REPO_OWNER} From 44968167b7f42a467ddff038639bf5432012ff18 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:47:10 +0100 Subject: [PATCH 09/20] Actualiser Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ddbde1a..4bf3897 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM debian:trixie-slim AS build +FROM docker.io/debian:trixie-slim AS build # set version label ARG BUILD_DATE From 0a3ee809f25f8f821afd8fc21cbd3ad628303acd Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 16:54:39 +0100 Subject: [PATCH 10/20] Actualiser Dockerfile --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4bf3897..5f67844 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -# syntax=docker/dockerfile:1 - FROM docker.io/debian:trixie-slim AS build # set version label From 74136925794df66cbb39d8933dca95c8b5f13f80 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 17:06:24 +0100 Subject: [PATCH 11/20] Actualiser Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5f67844..1036477 100644 --- a/Dockerfile +++ b/Dockerfile @@ -68,10 +68,10 @@ COPY patches /tmp/patches RUN echo "**** install calibre ****" 1>&2 \ # install calibre binary -ENV LD_LIBRARY_PATH /usr/lib:/opt/calibre/lib -ENV PATH $PATH:/opt/calibre/bin -ENV LC_ALL C -ENV CALIBRE_INSTALLER https://download.calibre-ebook.com/linux-installer.sh +ENV LD_LIBRARY_PATH=/usr/lib:/opt/calibre/lib +ENV PATH=$PATH:/opt/calibre/bin +ENV LC_ALL=C +ENV CALIBRE_INSTALLER=https://download.calibre-ebook.com/linux-installer.sh RUN apt install -y libopengl0 \ && apt install -y libegl1 \ && apt install -y libxcb-cursor0 \ From a49c1ce7480aa2a9cb21f5a7b725138380437982 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 17:54:46 +0100 Subject: [PATCH 12/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index a0529a1..0dfed54 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -1,11 +1,17 @@ +kind: pipeline +name: default + steps: - publish: - image: woodpeckerci/plugin-docker-buildx - settings: - platforms: linux/amd64 - repo: gargoton.petite-maison-orange.fr/image/calibre-web - registry: gargoton.petite-maison-orange.fr - tags: latest - username: ${CI_REPO_OWNER} - password: +- name: docker + image: plugins/docker + settings: + username: kevinbacon + password: from_secret: eric_token + registry: gargoton.petite-maison-orange.fr + repo: gargoton.petite-maison-orange.fr/image/calibre-web + tags: + - latest + - main + ssh-agent-key: + from_secret: private_key From fd91265c54bcdcb9840f9fa1172c894aee32239e Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 17:55:48 +0100 Subject: [PATCH 13/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index 0dfed54..09745c8 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -1,4 +1,3 @@ -kind: pipeline name: default steps: @@ -13,5 +12,4 @@ steps: tags: - latest - main - ssh-agent-key: - from_secret: private_key + From 5e4c10884a142cf982f0e4eaf86e1b68596f7fb6 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 18:12:24 +0100 Subject: [PATCH 14/20] Actualiser .woodpecker/build-image.yaml --- .woodpecker/build-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-image.yaml b/.woodpecker/build-image.yaml index 09745c8..891ae4e 100644 --- a/.woodpecker/build-image.yaml +++ b/.woodpecker/build-image.yaml @@ -2,7 +2,7 @@ name: default steps: - name: docker - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: username: kevinbacon password: From ac7202553b80aee6370a2f42de0e0f421186a91b Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Thu, 26 Dec 2024 18:16:21 +0100 Subject: [PATCH 15/20] Actualiser Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 1036477..39f981b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/debian:trixie-slim AS build +FROM debian:trixie-slim AS build # set version label ARG BUILD_DATE From 121c4adf30e05957be621a0a5802e01d05819d93 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 27 Dec 2024 11:28:13 +0100 Subject: [PATCH 16/20] Ajouter .gitea/workflows/demo.yaml --- .gitea/workflows/demo.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .gitea/workflows/demo.yaml diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml new file mode 100644 index 0000000..394c807 --- /dev/null +++ b/.gitea/workflows/demo.yaml @@ -0,0 +1,19 @@ +name: Gitea Actions Demo +run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀 +on: [push] + +jobs: + Explore-Gitea-Actions: + runs-on: ubuntu-latest + steps: + - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." + - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!" + - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." + - name: Check out repository code + uses: actions/checkout@v4 + - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner." + - run: echo "🖥️ The workflow is now ready to test your code on the runner." + - name: List files in the repository + run: | + ls ${{ gitea.workspace }} + - run: echo "🍏 This job's status is ${{ job.status }}." \ No newline at end of file From e050e7ab57aca16744a61c40f91592738dec81d9 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 27 Dec 2024 11:57:54 +0100 Subject: [PATCH 17/20] Ajouter .gitea/workflows/build-push.yaml --- .gitea/workflows/build-push.yaml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .gitea/workflows/build-push.yaml diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml new file mode 100644 index 0000000..ff7eef7 --- /dev/null +++ b/.gitea/workflows/build-push.yaml @@ -0,0 +1,32 @@ +name: Build and Push Docker Image + +on: + push: + branches: + - main # Changez cela si votre branche principale a un autre nom + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Log in to Gitea Docker Registry + uses: docker/login-action@v1 + with: + registry: gargoton.petite-maison-orange.fr + username: ${{ secrets.GARGOTONUSERNAME }} # Assurez-vous d'ajouter ce secret dans Gitea + password: ${{ secrets.GARGOTONTOKEN }} # Assurez-vous d'ajouter ce secret dans Gitea + + - name: Build Docker image + run: | + docker build -t gargoton.petite-maison-orange.fr/image/calibre-web:latest . + + - name: Push Docker image + run: | + docker push gargoton.petite-maison-orange.fr/image/calibre-web:latest \ No newline at end of file From d96fe950163d7d30ef62d2a68ae2fd443a295b87 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 27 Dec 2024 12:04:45 +0100 Subject: [PATCH 18/20] Actualiser .gitea/workflows/build-push.yaml --- .gitea/workflows/build-push.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml index ff7eef7..b760a25 100644 --- a/.gitea/workflows/build-push.yaml +++ b/.gitea/workflows/build-push.yaml @@ -14,10 +14,10 @@ jobs: uses: actions/checkout@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Log in to Gitea Docker Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: gargoton.petite-maison-orange.fr username: ${{ secrets.GARGOTONUSERNAME }} # Assurez-vous d'ajouter ce secret dans Gitea From 3dfd608734085aad60d1d55dd0a8b8c309bb369d Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 27 Dec 2024 12:29:48 +0100 Subject: [PATCH 19/20] Actualiser .gitea/workflows/build-push.yaml --- .gitea/workflows/build-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml index b760a25..42a5d4f 100644 --- a/.gitea/workflows/build-push.yaml +++ b/.gitea/workflows/build-push.yaml @@ -20,7 +20,7 @@ jobs: uses: docker/login-action@v2 with: registry: gargoton.petite-maison-orange.fr - username: ${{ secrets.GARGOTONUSERNAME }} # Assurez-vous d'ajouter ce secret dans Gitea + username: eric # Assurez-vous d'ajouter ce secret dans Gitea password: ${{ secrets.GARGOTONTOKEN }} # Assurez-vous d'ajouter ce secret dans Gitea - name: Build Docker image From ce647f39840db00c004c6231eaafcaaa5d6a20db Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Fri, 27 Dec 2024 12:40:09 +0100 Subject: [PATCH 20/20] Actualiser .gitea/workflows/build-push.yaml --- .gitea/workflows/build-push.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml index 42a5d4f..7d1f10e 100644 --- a/.gitea/workflows/build-push.yaml +++ b/.gitea/workflows/build-push.yaml @@ -17,7 +17,7 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Log in to Gitea Docker Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: gargoton.petite-maison-orange.fr username: eric # Assurez-vous d'ajouter ce secret dans Gitea