From 4f3117f81bebc8627065fdea3a1c1b8e959c9444 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Sat, 29 Sep 2018 17:27:38 +0200 Subject: [PATCH] Better naming of android make targets --- Makefile | 56 +++++++++++++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index 777c723..75fe74a 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ info: ## Print some information about the current install, for debugging update: ## Download most recent images $(DOCKER_COMPOSE) pull -build: build-openedx build-configurator build-forum build-notes build-xqueue ## Build all docker images +build: build-openedx build-configurator build-forum build-notes build-xqueue build-android ## Build all docker images build-openedx: ## Build the Open edX docker image docker build -t regis/openedx:latest -t regis/openedx:hawthorn openedx/ @@ -142,6 +142,31 @@ build-notes: ## Build the Notes docker image docker build -t regis/openedx-notes:latest -t regis/openedx-notes:hawthorn notes/ build-xqueue: ## Build the Xqueue docker image docker build -t regis/openedx-xqueue:latest -t regis/openedx-xqueue:hawthorn xqueue/ +build-android: ## Build the docker image for Android + docker build -t regis/openedx-android:latest android/ + +################### Pushing images to docker hub + +push: push-openedx push-configurator push-forum push-notes push-xqueue push-android ## Push all images to dockerhub +push-openedx: ## Push Open edX images to dockerhub + docker push regis/openedx:hawthorn + docker push regis/openedx:latest +push-configurator: ## Push configurator image to dockerhub + docker push regis/openedx-configurator:hawthorn + docker push regis/openedx-configurator:latest +push-forum: ## Push dorum image to dockerhub + docker push regis/openedx-forum:hawthorn + docker push regis/openedx-forum:latest +push-notes: ## Push notes image to dockerhub + docker push regis/openedx-notes:hawthorn + docker push regis/openedx-notes:latest +push-xqueue: ## Push Xqueue image to dockerhub + docker push regis/openedx-xqueue:hawthorn + docker push regis/openedx-xqueue:latest +push-android: ## Push the Android image to dockerhub + docker push regis/openedx-android:latest + +dockerhub: build push ## Build and push all images to dockerhub ##################### Development @@ -175,37 +200,10 @@ android: ## Build the Android app, for development docker-compose -f docker-compose-android.yml run --rm android @echo "Your APK file is ready: ./data/android/edx-prod-debuggable-2.14.0.apk" -android-release: ## Build the Android app +android-release: ## Build the final Android app (beta) # Note that this requires that you edit ./config/android/gradle.properties docker-compose -f docker-compose-android.yml run --rm android ./gradlew assembleProdRelease -android-build: ## Build the docker image for Android - docker build -t regis/openedx-android:latest android/ -android-push: ## Push the Android image to dockerhub - docker push regis/openedx-android:latest -android-dockerhub: android-build android-push ## Build and push the Android image to dockerhub - -################### Pushing to docker hub - -push: push-openedx push-forum push-notes push-xqueue push-configurator ## Push all images to dockerhub -push-openedx: ## Push Open edX images to dockerhub - docker push regis/openedx:hawthorn - docker push regis/openedx:latest -push-configurator: ## Push configurator image to dockerhub - docker push regis/openedx-configurator:hawthorn - docker push regis/openedx-configurator:latest -push-forum: ## Push dorum image to dockerhub - docker push regis/openedx-forum:hawthorn - docker push regis/openedx-forum:latest -push-notes: ## Push notes image to dockerhub - docker push regis/openedx-notes:hawthorn - docker push regis/openedx-notes:latest -push-xqueue: ## Push Xqueue image to dockerhub - docker push regis/openedx-xqueue:hawthorn - docker push regis/openedx-xqueue:latest - -dockerhub: build push ## Build and push all images to dockerhub - ##################### Additional commands stats: ## Collect anonymous information about the platform