From 8f07199777a2a3a6e233f858e110dbb0cfad6fad Mon Sep 17 00:00:00 2001 From: Benjamin Reich Date: Sun, 5 Nov 2023 22:46:01 +0100 Subject: add multi arch docker build (#5808) * Add multi arch container build Co-authored-by: EdJoPaTo Co-authored-by: Alexandre Alapetite * using label from github action * dont remove static labels and split docker readme in seperate action * pin 3rd party action to a commit * enable pushing to dockerhub * Update .github/workflows/build-images.yml Co-authored-by: EdJoPaTo * remove not needed checkout * set github token permissions * Update .github/workflows/push-dockerhub-readme.yml * update docker readme to match new tags * Apply suggestions from code review * fix suffix for alpine image * fix suffix for alpine image * push images only at upstream repo * push images only at upstream repo * push images only at upstream repo * tag latest-alpine as alpine * tag latest-alpine as alpine * remove no needed falvor * keep falvor for build * Clean more things * Rename action To use same default name than https://github.com/actions/starter-workflows/blob/main/ci/docker-publish.yml * Rename readme action To use same default name than https://github.com/peter-evans/dockerhub-description/blob/main/.github/workflows/dockerhub-description.yml * Use default name for dockerhub-description https://github.com/peter-evans/dockerhub-description/blob/main/.github/workflows/dockerhub-description.yml Plus minor wording * Experiment with build-args * Debug * Add checkout back * Revert back to metadata-action * Remove quotes in version * Try to fix variables * Experiment with automatic label values again * Delete last Docker Hub hooks * Use only git SHA for org.opencontainers.image.revision https://specs.opencontainers.org/image-spec/annotations/#pre-defined-annotation-keys * Comment out semver for now Might be enabled later if desired * Enable major semver --------- Co-authored-by: EdJoPaTo Co-authored-by: Alexandre Alapetite Co-authored-by: EdJoPaTo --- docs/en/developers/02_First_steps.md | 6 ++---- docs/fr/developers/01_First_steps.md | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'docs') diff --git a/docs/en/developers/02_First_steps.md b/docs/en/developers/02_First_steps.md index bc6361167..87c64ee2f 100644 --- a/docs/en/developers/02_First_steps.md +++ b/docs/en/developers/02_First_steps.md @@ -40,7 +40,7 @@ If you’re interested in the configuration, the `make` commands are defined in If you need to use a different tag image (default is `alpine`), you can set the `TAG` environment variable: ```sh -TAG=arm make start +TAG=alpine make start ``` You can find the full list of available tags [on the Docker hub](https://hub.docker.com/r/freshrss/freshrss/tags). @@ -49,11 +49,9 @@ If you want to build the Docker image yourself, you can use the following comman ```sh make build -# or -TAG=arm make build ``` -The `TAG` variable can be anything (e.g. `local`). You can target a specific architecture by adding `-alpine` or `-arm` at the end of the tag (e.g. `local-arm`). +The `TAG` variable can be anything (e.g. `local`). You can target a specific architecture by adding `-alpine` at the end of the tag (e.g. `local-alpine`). ## Project architecture diff --git a/docs/fr/developers/01_First_steps.md b/docs/fr/developers/01_First_steps.md index f53cbaeb8..08f9436ff 100644 --- a/docs/fr/developers/01_First_steps.md +++ b/docs/fr/developers/01_First_steps.md @@ -66,7 +66,7 @@ suivante la variable d’environnement `TAG` au moment de l’exécution de la commande : ```sh -TAG=arm make start +TAG=alpine make start ``` Vous pouvez trouver la liste complète des tags disponibles [sur le hub @@ -77,13 +77,11 @@ suivante : ```sh make build -# ou -TAG=arm make build ``` La valeur de la variable `TAG` peut contenir n’importe quelle valeur (par exemple `local`). Vous pouvez cibler une architecture spécifique en ajoutant -`-alpine` ou `-arm` à la fin du tag (par exemple `local-arm`). +`-alpine` à la fin du tag (par exemple `local-alpine`). ## Architecture du projet -- cgit v1.2.3