Merge pull request #1 from holashchand/apple-silicon

using same dockerfile for both apple silicon/other
VenuChoudhary001 · Oct 18, 2023 · b9b4f0d · b9b4f0d
2 parents 3a141e3 + c7e1153
commit b9b4f0d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/deps/keycloak/Dockerfile b/deps/keycloak/Dockerfile
@@ -1,4 +1,5 @@
-FROM sunbirdrc/keycloak
+ARG KEYCLOAK_BASE_IMAGE=sunbirdrc/keycloak
+FROM $KEYCLOAK_BASE_IMAGE
 
 ADD themes /opt/jboss/keycloak/themes
 ADD providers /opt/jboss/keycloak/providers

diff --git a/deps/keycloak/Dockerfile.mac b/deps/keycloak/Dockerfile.mac
diff --git a/deps/keycloak/Makefile b/deps/keycloak/Makefile
@@ -1,13 +1,21 @@
-build-mac-base:
-	@docker build -t ghcr.io/sunbird-rc/keycloak-silicon -f apple-silicon/Dockerfile apple-silicon
+IMAGE_DESTINATION=ghcr.io/sunbird-rc
 
-build: build-mac-base
+build:
 	echo "Building docker image"
 	@cd ../keycloak-mobile-number-login-spi/ && sh ./build.sh
-	@docker build -t ghcr.io/sunbird-rc/sunbird-rc-keycloak -f Dockerfile .
-	@docker build -t ghcr.io/sunbird-rc/sunbird-rc-keycloak:silicon -f Dockerfile.mac .
+	@docker build -t $(IMAGE_DESTINATION)/sunbird-rc-keycloak .
 
 push:
-	@docker push ghcr.io/sunbird-rc/sunbird-rc-keycloak
-	@docker push ghcr.io/sunbird-rc/sunbird-rc-keycloak:silicon
+	@docker push $(IMAGE_DESTINATION)/sunbird-rc-keycloak
+
+build-silicon-base:
+	@docker build -t $(IMAGE_DESTINATION)/keycloak-silicon -f apple-silicon/Dockerfile apple-silicon
+
+build-silicon:
+	echo "Building docker image"
+	@cd ../keycloak-mobile-number-login-spi/ && sh ./build.sh
+	@docker build -t $(IMAGE_DESTINATION)/sunbird-rc-keycloak:silicon --build-arg KEYCLOAK_BASE_IMAGE=vikastc/sunbirdrc-keycloak:apple-silicon .
+
+push-silicon:
+	@docker push $(IMAGE_DESTINATION)/sunbird-rc-keycloak:silicon