From f3ac33ae5f84c769aa37f7cd5f000ed46c28b1c3 Mon Sep 17 00:00:00 2001 From: jiriks74 Date: Mon, 29 Apr 2024 02:58:38 +0200 Subject: [PATCH] fix(ci/cd): Stable imagage used latest as a base --- .gitea/workflows/build_latest.yml | 7 ++++--- .gitea/workflows/build_stable.yml | 7 ++++--- Dockerfile | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/build_latest.yml b/.gitea/workflows/build_latest.yml index 8e0d7be..a1bf1f8 100644 --- a/.gitea/workflows/build_latest.yml +++ b/.gitea/workflows/build_latest.yml @@ -52,8 +52,9 @@ jobs: uses: docker/build-push-action@v2 with: push: true - tags: jiriks74/nextcloud-extended:${{ steps.extract-version.outputs.version }},jiriks74/nextcloud-extended:latest - platforms: linux/amd64,linux/arm64 - context: . file: ./Dockerfile + context: . + build-args: NEXTCLOUD_VERSION=${{ steps.extract-version.outputs.version }} + platforms: linux/amd64,linux/arm64 + tags: jiriks74/nextcloud-extended:${{ steps.extract-version.outputs.version }},jiriks74/nextcloud-extended:latest diff --git a/.gitea/workflows/build_stable.yml b/.gitea/workflows/build_stable.yml index 4befa62..34318b5 100644 --- a/.gitea/workflows/build_stable.yml +++ b/.gitea/workflows/build_stable.yml @@ -55,8 +55,9 @@ jobs: uses: docker/build-push-action@v2 with: push: true - tags: jiriks74/nextcloud-extended:${{ steps.extract-version.outputs.version }},jiriks74/nextcloud-extended:${{ steps.extract-version.outputs.version-major }},jiriks74/nextcloud-extended:stable - platforms: linux/amd64,linux/arm64 - context: . file: ./Dockerfile + context: . + build-args: NEXTCLOUD_VERSION=${{ steps.extract-version.outputs.version }} + platforms: linux/amd64,linux/arm64 + tags: jiriks74/nextcloud-extended:${{ steps.extract-version.outputs.version }},jiriks74/nextcloud-extended:${{ steps.extract-version.outputs.version-major }},jiriks74/nextcloud-extended:stable diff --git a/Dockerfile b/Dockerfile index b62d671..c4b3852 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM nextcloud:latest +ARG NEXTCLOUD_VERSION +FROM nextcloud:${NEXTCLOUD_VERSION} LABEL maintainer="Jiří Štefka " RUN apt update && apt upgrade -y --no-install-recommends && apt install gnupg2 ffmpeg aria2 libmagickcore-dev -y --no-install-recommends