From aef11398974abf8d02a4aa6a5801dca2dfdcddd6 Mon Sep 17 00:00:00 2001
From: Florian Haftmann <flha@uhurutec.com>
Date: Fri, 1 Dec 2023 13:49:07 +0100
Subject: [PATCH] style: Uniform order of arguments, shorter lines

Explicit line breaks make passed arguments clear.

Change-Id: I6ef3b7b52634bca05de63033b0baed2163a65ce9
---
 Makefile             | 9 +++++++--
 container/Dockerfile | 6 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8d9b9ee..26679c7 100644
--- a/Makefile
+++ b/Makefile
@@ -80,10 +80,15 @@ else
 endif
 build:
 	GIT_CONSOLE_COMMIT=$(shell rm -rf skyline-console-master.tar.gz && wget $(SKYLINE_CONSOLE_PACKAGE_URL) && tar -zxf skyline-console-master.tar.gz && cat skyline-console-*/skyline_console/static/commit_id.txt); \
-	$(build_cmd) --no-cache --pull --force-rm --build-arg RELEASE_VERSION=$(RELEASE_VERSION) --build-arg SKYLINE_CONSOLE_PACKAGE_URL=$(SKYLINE_CONSOLE_PACKAGE_URL) --build-arg GIT_BRANCH=$(GIT_BRANCH) --build-arg GIT_COMMIT=$(GIT_COMMIT) --build-arg GIT_CONSOLE_COMMIT=$$GIT_CONSOLE_COMMIT $(BUILD_ARGS) -f $(DOCKER_FILE) -t $(IMAGE):$(IMAGE_TAG) $(BUILD_CONTEXT)
+	$(build_cmd) --no-cache --pull --force-rm \
+	  --build-arg SKYLINE_CONSOLE_PACKAGE_URL=$(SKYLINE_CONSOLE_PACKAGE_URL) \
+	  --build-arg GIT_CONSOLE_COMMIT=$$GIT_CONSOLE_COMMIT \
+	  --build-arg GIT_BRANCH=$(GIT_BRANCH) \
+	  --build-arg GIT_COMMIT=$(GIT_COMMIT) \
+	  --build-arg RELEASE_VERSION=$(RELEASE_VERSION) \
+	  $(BUILD_ARGS) -f $(DOCKER_FILE) -t $(IMAGE):$(IMAGE_TAG) $(BUILD_CONTEXT)
 	rm -rf skyline-console-*
 
-
 .PHONY: db_revision
 HEAD_REV ?= $(shell alembic -c skyline_apiserver/db/alembic/alembic.ini heads | awk '{print $$1}')
 NEW_REV ?= $(shell python3 -c 'import sys; print(f"{int(sys.argv[1])+1:03}")' $(HEAD_REV))
diff --git a/container/Dockerfile b/container/Dockerfile
index d51d72c..46b01fd 100644
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -1,15 +1,15 @@
 
 FROM ubuntu:20.04
 
+ARG SKYLINE_CONSOLE_PACKAGE_URL
+ARG GIT_CONSOLE_COMMIT
 ARG GIT_BRANCH
 ARG GIT_COMMIT
-ARG GIT_CONSOLE_COMMIT
 ARG RELEASE_VERSION
-ARG SKYLINE_CONSOLE_PACKAGE_URL
 
+LABEL skyline.build_console_commit=${GIT_CONSOLE_COMMIT}
 LABEL skyline.build_branch=${GIT_BRANCH}
 LABEL skyline.build_commit=${GIT_COMMIT}
-LABEL skyline.build_console_commit=${GIT_CONSOLE_COMMIT}
 LABEL skyline.release_version=${RELEASE_VERSION}
 
 ENV LANG C.UTF-8