From ed1e8996ed947ffc911b7c05ca4235cdaeb6e2e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Laurent?= <francois.laurent@posteo.net>
Date: Thu, 17 Apr 2025 12:48:01 +0200
Subject: [PATCH] fix: revert previous commit and pass LARVATAGGER_IMAGE_TAG
build arg
---
.gitlab-ci.yml | 6 ++----
back/Containerfile.larvatagger | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dfd29d8..c3673a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
variables:
GITLAB_PASTEUR_PROJECT_ID: 6531
PROJECT_NAME: nyxui
- LARVATAGGER_IMAGE_TAG: 0.20.1-bigfat
stages:
- build
@@ -101,7 +100,6 @@ deploy to dev.pasteur.cloud:
LT_LIMITS_CPU: "2"
LT_LIMITS_MEMORY: "5Gi"
LT_LIMITS_STORAGE: "2Gi"
- LT_IMAGE_TAG: "$LARVATAGGER_IMAGE_TAG"
environment:
name: k8sdev-01/nyx-dev
url: https://nyx.dev.pasteur.cloud
@@ -114,8 +112,8 @@ build larvatagger backend:
extends: .build-with-buildah
variables:
IMAGE_NAME: "larvatagger"
- IMAGE_TAG: "$LARVATAGGER_IMAGE_TAG"
- BUILD_CONTEXT: "back"
+ IMAGE_TAG: "0.20.1-bigfat"
+ BUILD_CONTEXT: "--build-arg LARVATAGGER_IMAGE_TAG=$IMAGE_TAG back"
CONTAINERFILE: "back/Containerfile.larvatagger"
rules:
- if: ($CI_COMMIT_BRANCH == "dev" &&
diff --git a/back/Containerfile.larvatagger b/back/Containerfile.larvatagger
index bc9e4af..963f042 100644
--- a/back/Containerfile.larvatagger
+++ b/back/Containerfile.larvatagger
@@ -1,4 +1,4 @@
-ARG LARVATAGGER_IMAGE_TAG=0.20-bigfat
+ARG LARVATAGGER_IMAGE_TAG=0.20.1-bigfat
FROM docker.io/flaur/larvatagger:${LARVATAGGER_IMAGE_TAG} as src
--
GitLab