update dockerfile for launchql and makefile

Author: Anmol1696

docker/Makefile

@@ -54,15 +54,7 @@ build-process-version:
 	@test -n "$(BASE)" || { echo "Error: BASE is required"; exit 1; }
 	@test -n "$(VERSION)" || { echo "Error: VERSION is required"; exit 1; }
 	@echo "  -> $(BASE):$(VERSION) => $(REPO_NAME)/$(PROCESS):$(VERSION) (build)"
-	@DOCKERFILE_PATH=$$( \
-		if [ "$(PROCESS)" = "postgis" ]; then \
-			case "$(VERSION)" in \
-				13.*) echo "$(PROCESS)/Dockerfile.legacy" ;; \
-				*)    echo "$(PROCESS)/Dockerfile" ;; \
-			esac; \
-		else \
-			echo "$(PROCESS)/Dockerfile"; \
-		fi ); \
+	@DOCKERFILE_PATH="$(PROCESS)/Dockerfile"; \
 		CONTEXT=$$( \
 		if [ "$(PROCESS)" = "launchql" ]; then \
 			echo ".."; \
@@ -83,15 +75,7 @@ build-push-process-version:
 	@test -n "$(BASE)" || { echo "Error: BASE is required"; exit 1; }
 	@test -n "$(VERSION)" || { echo "Error: VERSION is required"; exit 1; }
 	@echo "  -> $(BASE):$(VERSION) => $(REPO_NAME)/$(PROCESS):$(VERSION) (push)"
-	@DOCKERFILE_PATH=$$( \
-		if [ "$(PROCESS)" = "postgis" ]; then \
-			case "$(VERSION)" in \
-				13.*) echo "$(PROCESS)/Dockerfile.legacy" ;; \
-				*)    echo "$(PROCESS)/Dockerfile" ;; \
-			esac; \
-		else \
-			echo "$(PROCESS)/Dockerfile"; \
-		fi ); \
+	@DOCKERFILE_PATH="$(PROCESS)/Dockerfile"; \
 		CONTEXT=$$( \
 		if [ "$(PROCESS)" = "launchql" ]; then \
 			echo ".."; \

docker/launchql/Dockerfile

@@ -15,7 +15,8 @@ RUN set -eux; \
     apt-get install -y --no-install-recommends \
       ca-certificates curl git python3 make g++; \
     update-ca-certificates || true; \
-    npm i -g yarn@1; \
+    corepack enable; \
+    corepack prepare yarn@1.22.22 --activate; \
     rm -rf /var/lib/apt/lists/*
 
 # Copy full repo (build context must be repo root when building this image)
@@ -37,7 +38,8 @@ RUN set -eux; \
     apt-get update; \
     apt-get install -y --no-install-recommends ca-certificates postgresql-client; \
     update-ca-certificates || true; \
-    npm i -g yarn@1; \
+    corepack enable; \
+    corepack prepare yarn@1.22.22 --activate; \
     rm -rf /var/lib/apt/lists/*
 
 # Copy built repo from builder
@@ -52,4 +54,3 @@ RUN set -eux; \
 
 ENTRYPOINT ["/usr/local/bin/lql"]
 CMD ["--help"]
-