daemon: start transition of image name to inertiad (#689)

ubclaunchpad · Sep 30, 2020 · 1e2ae0c · 1e2ae0c
1 parent 3d23ac1
commit 1e2ae0c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/publish-latest.yml b/.github/workflows/publish-latest.yml
@@ -15,9 +15,11 @@ jobs:
     - name: Publish to Docker Hub
       run: |
         docker login -u ${{ secrets.docker_user }} -p ${{ secrets.docker_key }}
+        # Publish as legacy name
+        docker tag ubclaunchpad/inertiad:latest ubclaunchpad/inertia:latest
         docker push ubclaunchpad/inertia:latest
     - name: Publish to GitHub Container Registry
       run: |
         echo ${{ secrets.GH_PACKAGES_TOKEN }} | docker login ghcr.io --username $GITHUB_ACTOR --password-stdin
-        docker tag ubclaunchpad/inertia:latest ghcr.io/ubclaunchpad/inertia:latest
-        docker push ghcr.io/ubclaunchpad/inertia:latest
+        docker tag ubclaunchpad/inertiad:latest ghcr.io/ubclaunchpad/inertiad:latest
+        docker push ghcr.io/ubclaunchpad/inertiad:latest
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -19,12 +19,14 @@ jobs:
     - name: Publish to Docker Hub
       run: |
         docker login -u ${{ secrets.docker_user }} -p ${{ secrets.docker_key }}
+        # Publish as legacy name
+        docker tag ubclaunchpad/inertiad:$(git describe --tags) ubclaunchpad/inertia:$(git describe --tags)
         docker push ubclaunchpad/inertia:$(git describe --tags)
     - name: Publish to GitHub Container Registry
       run: |
         echo ${{ secrets.GH_PACKAGES_TOKEN }} | docker login ghcr.io --username $GITHUB_ACTOR --password-stdin
-        docker tag ubclaunchpad/inertia:$(git describe --tags) ghcr.io/ubclaunchpad/inertia:$(git describe --tags)
-        docker push ghcr.io/ubclaunchpad/inertia:$(git describe --tags)
+        docker tag ubclaunchpad/inertiad:$(git describe --tags) ghcr.io/ubclaunchpad/inertiad:$(git describe --tags)
+        docker push ghcr.io/ubclaunchpad/inertiad:$(git describe --tags)
     - name: Publish CLI
       uses: softprops/action-gh-release@v1
       with:

diff --git a/Makefile b/Makefile
@@ -5,6 +5,7 @@ VPS_OS = ubuntu
 RELEASE = test
 CLI_VERSION_VAR = main.Version
 PROJECTNAME=inertia
+DAEMON_IMAGE=ubclaunchpad/inertiad
 
 .PHONY: help
 help: Makefile
@@ -61,6 +62,7 @@ install:
 daemon:
 	mkdir -p ./images
 	rm -f ./images/inertia-daemon-image
+	# TODO - replace ubclaunchpad/inertia with DAEMON_IMAGE
 	docker build --build-arg INERTIA_VERSION=$(TAG) \
 		-t ubclaunchpad/inertia:test .
 	docker save -o ./images/inertia-daemon-image ubclaunchpad/inertia:test
@@ -219,11 +221,11 @@ testenv-clean:
 install-tagged:
 	go install -ldflags "-X $(CLI_VERSION_VAR)=$(TAG)"
 
-## daemon-release: build the daemon as ubclaunchpad/inertia:RELEASE
+## daemon-release: build the daemon as ubclaunchpad/inertiad:RELEASE
 .PHONY: daemon-release
 daemon-release:
 	docker build --build-arg INERTIA_VERSION=$(RELEASE) \
-		-t ubclaunchpad/inertia:$(RELEASE) .
+		-t $(DAEMON_IMAGE):$(RELEASE) .
 
 ## cli-release: cross-compile Inertia CLI binaries for distribution
 .PHONY: cli-release