feat: upload docker image to github (#3384)

monicahq · Dec 28, 2019 · 6674529 · 6674529
1 parent 081ae49
commit 6674529
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/.azure/azure.sig b/.azure/azure.sig
diff --git a/.azure/step-docker-push-bintray.yml b/.azure/step-docker-push-bintray.yml
diff --git a/.azure/step-docker-push-github.yml b/.azure/step-docker-push-github.yml
@@ -0,0 +1,9 @@
+steps:
+- task: Docker@2
+  displayName: Login to docker
+  inputs:
+    command: login
+    containerRegistry: docker-github
+
+- script: make docker_push_github
+  displayName: Publish docker image
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ### New features:
 
 * Save contact tags in vCard 'CATEGORIES' field
+* Upload master docker image to GitHub packages
 
 ### Enhancements:
 

diff --git a/Makefile b/Makefile
@@ -163,7 +163,19 @@ docker_push_bintray_fpm: .deploy.json
 	docker push monicahq-docker-docker.bintray.io/$(DOCKER_IMAGE):$(BUILD)-fpm
 	BUILD=$(BUILD)-fpm scripts/ci/fix-bintray.sh
 
-.PHONY: docker docker_build docker_build_master docker_build_apache docker_build_fpm docker_build_php_apache docker_tag docker_push docker_push_bintray docker_push_bintray_apache docker_push_bintray_fpm
+docker_push_github: docker_push_github_apache docker_push_github_fpm
+
+docker_push_githuby_apache:
+	docker tag $(DOCKER_IMAGE) docker.pkg.github.com/monicahq/monica/$(DOCKER_IMAGE):$(BUILD)
+	docker push docker.pkg.github.com/monicahq/monica/$(DOCKER_IMAGE):$(BUILD)
+
+docker_push_github_fpm:
+	docker tag $(DOCKER_IMAGE) docker.pkg.github.com/monicahq/monica/$(DOCKER_IMAGE):$(BUILD)-fpm
+	docker push docker.pkg.github.com/monicahq/monica/$(DOCKER_IMAGE):$(BUILD)-fpm
+
+.PHONY: docker docker_build docker_build_master docker_build_apache docker_build_fpm docker_build_php_apache docker_tag
+.PHONY: docker_push docker_push_bintray docker_push_bintray_apache docker_push_bintray_fpm
+.PHONY: docker_push_github docker_push_githuby_apache docker_push_github_fpm
 
 build:
 	composer install --no-interaction --no-suggest --ignore-platform-reqs

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -70,7 +70,7 @@ stages:
     steps:
     - template: .azure/step-prepare-environment.yml
     - template: .azure/step-docker-build.yml
-    - template: .azure/step-docker-push-bintray.yml
+    - template: .azure/step-docker-push-github.yml
 
   - job: deploy_docker
     condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
@@ -79,5 +79,5 @@ stages:
     steps:
     - template: .azure/step-prepare-environment.yml
     - template: .azure/step-docker-build.yml
-    - template: .azure/step-docker-push-bintray.yml
+    - template: .azure/step-docker-push-github.yml
     - template: .azure/step-docker-push.yml