From a2514576a2b0a5c53fa5160309426a19efd9e757 Mon Sep 17 00:00:00 2001
From: Mateusz Wisniewski <mwisnia97@gmail.com>
Date: Mon, 20 Mar 2023 14:18:16 +0100
Subject: [PATCH] fix dockerfiles (#2393)

* bump

* bump

* fix dockerfiles

* more fixes

* remove first debug

* revert bump
---
 Dockerfile       | 4 ++--
 Dockerfile.local | 4 ++--
 Makefile         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f8ee52b64c..da717a080a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # ---- Base Alpine with Node ----
 FROM alpine:3.15.0 AS builder
-ARG TAG_DEFAULT_TAG
+ARG TAG_default_tag
 
 RUN apk add --update nodejs npm
 
@@ -17,7 +17,7 @@ ENV CI true
 
 COPY . /app
 
-RUN sed -i "s/version: dev/version: ${TAG_DEFAULT_TAG}/" public/version.yaml && make resolve validate
+RUN sed -i "s/version: dev/version: ${TAG_default_tag}/" public/version.yaml && make resolve validate
 
 RUN npm test 2>&1 && npm run build:docker
 
diff --git a/Dockerfile.local b/Dockerfile.local
index 7f6f1c26a2..662fd49d09 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -2,7 +2,7 @@
 
 # ---- Base Alpine with Node ----
 FROM alpine:3.15.0 AS builder
-ARG TAG_DEFAULT_TAG
+ARG TAG_default_tag
 
 RUN apk add --update nodejs npm
 
@@ -19,7 +19,7 @@ ENV CI true
 
 COPY . /app
 
-RUN sed -i "s/version: dev/version: ${TAG_DEFAULT_TAG}/" public/version.yaml && make resolve validate
+RUN sed -i "s/version: dev/version: ${TAG_default_tag}/" public/version.yaml && make resolve validate
 
 RUN npm test 2>&1 && npm run build:docker
 RUN cd /app/backend && npm run build
diff --git a/Makefile b/Makefile
index 0f452db317..9ff699575c 100644
--- a/Makefile
+++ b/Makefile
@@ -29,10 +29,10 @@ release: build-image push-image
 release-local: build-image-local push-image-local
 
 build-image:
-	docker build --build-arg=TAG_DEFAULT_TAG=$(TAG) -t $(IMG_NAME) -f Dockerfile .
+	docker build --build-arg=TAG_default_tag=$(TAG) -t $(IMG_NAME) -f Dockerfile .
 
 build-image-local:
-	docker build --build-arg=TAG_DEFAULT_TAG=$(TAG) -t $(LOCAL_IMG_NAME) -f Dockerfile.local .
+	docker build --build-arg=TAG_default_tag=$(TAG) -t $(LOCAL_IMG_NAME) -f Dockerfile.local .
 
 push-image:
 	docker tag $(IMG_NAME) $(IMG):$(TAG)