From c659325267f93b0d4344a4f550a767904d1d973a Mon Sep 17 00:00:00 2001
From: ILoveYaToo <dev@iloveyatoo.com>
Date: Thu, 28 Jan 2021 22:42:18 -0500
Subject: [PATCH] update semaphore build

---
 .semaphore/semaphore.yml  | 8 ++++----
 .semaphore/tests.yml      | 1 +
 .semaphore/upload.yml     | 4 +---
 alpine/docker-compose.yml | 2 +-
 ubuntu/docker-compose.yml | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 9144450..f473e1c 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -12,15 +12,15 @@ blocks:
           commands:
             - checkout
             - cd alpine
-            - 'docker build --network=host -t catdeployed/postal:alpine .'
-            - docker save -o postal-alpine-container.tar catdeployed/postal:alpine
+            - docker build --network=host -t docker.pkg.github.com/catdeployed/docker-postal/postal:alpine .
+            - docker save -o postal-alpine-container.tar docker.pkg.github.com/catdeployed/docker-postal/postal:alpine
             - artifact push workflow postal-alpine-container.tar --expire-in 1d
         - name: 'Ubuntu'
           commands:
             - checkout
             - cd ubuntu
-            - 'docker build --network=host -t catdeployed/postal:ubuntu .'
-            - docker save -o postal-ubuntu-container.tar catdeployed/postal:ubuntu
+            - docker build --network=host -t docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu .
+            - docker save -o postal-ubuntu-container.tar docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu
             - artifact push workflow postal-ubuntu-container.tar --expire-in 1d
 promotions:
   - name: Default Promotion
diff --git a/.semaphore/tests.yml b/.semaphore/tests.yml
index 1698675..587ce2e 100644
--- a/.semaphore/tests.yml
+++ b/.semaphore/tests.yml
@@ -22,6 +22,7 @@ blocks:
             - cd ubuntu
             - artifact pull workflow postal-ubuntu-container.tar
             - docker load -i postal-ubuntu-container.tar
+            - cp tests/docker-compose.yml docker-compose.yml
             - docker-compose up -d
             - for i in {1..20}; do if [[ $(docker inspect postal | jq -r '.[].State.Health.Status') == "healthy" ]]; then break; elif [[ $i -eq 20 ]]; then exit 1; else sleep 15; fi; done;
 promotions:
diff --git a/.semaphore/upload.yml b/.semaphore/upload.yml
index adac71b..013cb2c 100644
--- a/.semaphore/upload.yml
+++ b/.semaphore/upload.yml
@@ -18,8 +18,7 @@ blocks:
             - artifact pull workflow postal-alpine-container.tar
             - docker load -i postal-alpine-container.tar
             - echo "$DOCKER_GITHUB_PASS" | docker login docker.pkg.github.com --username "$DOCKER_GITHUB_USER" --password-stdin
-            - docker tag catdeployed/postal:alpine docker.pkg.github.com/catdeployed/docker-postal/postal:alpine
-            - docker tag catdeployed/postal:alpine docker.pkg.github.com/catdeployed/docker-postal/postal:latest
+            - docker.pkg.github.com/catdeployed/docker-postal/postal:alpine docker.pkg.github.com/catdeployed/docker-postal/postal:latest
             - docker push docker.pkg.github.com/catdeployed/docker-postal/postal:alpine
             - docker push docker.pkg.github.com/catdeployed/docker-postal/postal:latest
             - artifact yank workflow postal-alpine-container.tar
@@ -30,6 +29,5 @@ blocks:
             - artifact pull workflow postal-ubuntu-container.tar
             - docker load -i postal-ubuntu-container.tar
             - echo "$DOCKER_GITHUB_PASS" | docker login docker.pkg.github.com --username "$DOCKER_GITHUB_USER" --password-stdin
-            - docker tag catdeployed/postal:ubuntu docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu
             - docker push docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu
             - artifact yank workflow postal-ubuntu-container.tar
diff --git a/alpine/docker-compose.yml b/alpine/docker-compose.yml
index f06a614..0c806b6 100644
--- a/alpine/docker-compose.yml
+++ b/alpine/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   postal:
-    image: catdeployed/postal:alpine
+    image: docker.pkg.github.com/catdeployed/docker-postal/postal:alpine
     container_name: postal
     command: run
     ports:
diff --git a/ubuntu/docker-compose.yml b/ubuntu/docker-compose.yml
index 68edd15..a026604 100644
--- a/ubuntu/docker-compose.yml
+++ b/ubuntu/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 services:
   postal:
-    image: catdeployed/postal:ubuntu
+    image: docker.pkg.github.com/catdeployed/docker-postal/postal:ubuntu
     container_name: postal
     command: run
     tty: true