From 106e0534b173200ac43d4189809b95d94a09ceaa Mon Sep 17 00:00:00 2001
From: "Nicholas St. Germain" <nick@cajun.pro>
Date: Wed, 16 Jan 2019 13:12:57 -0600
Subject: [PATCH] cleanup for next version

---
 deploy.sh             | 10 ++++++----
 manifest_generator.py |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/deploy.sh b/deploy.sh
index 6944546..c5ae409 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -19,13 +19,15 @@ echo "$DOCKER_PASSWORD" | docker login -u="$DOCKER_USER" --password-stdin
 
 # Latest x64
 docker build -t "${NAMESPACE}:latest" . && \
-docker push "${NAMESPACE}:latest" && \
-# Versioned x64
-docker tag "${NAMESPACE}:latest" "${NAMESPACE}:${VERSION}" && \
-docker push "${NAMESPACE}:${VERSION}" && \
+docker push "${NAMESPACE}:latest"
 # x64 Arch
 docker tag "${NAMESPACE}:latest" "${NAMESPACE}:latest-amd64" && \
 docker push "${NAMESPACE}:latest-amd64"
+# Versioned x64
+docker tag "${NAMESPACE}:latest" "${NAMESPACE}:${VERSION}" && \
+docker push "${NAMESPACE}:${VERSION}"
+docker tag "${NAMESPACE}:latest" "${NAMESPACE}:${VERSION}-amd64" && \
+docker push "${NAMESPACE}:${VERSION}-amd64"
 
 # Prepare qemu for ARM builds
 docker run --rm --privileged multiarch/qemu-user-static:register --reset
diff --git a/manifest_generator.py b/manifest_generator.py
index db200db..d429f50 100644
--- a/manifest_generator.py
+++ b/manifest_generator.py
@@ -4,7 +4,7 @@ from varken import VERSION
 
 org = 'boerderij'
 project = 'varken'
-namespace = f"{org}/{project}"
+namespace = "{}/{}".format(org, project)
 
 yaml_arr = []
 tags = ['latest', VERSION]
@@ -17,12 +17,12 @@ arch_list = [('arm', 'arm', 'v6', 'linux'),
 
 for tag in tags:
     yaml_doc = {
-        'image': f'{namespace}:{tag}',
+        'image': '{}:{}'.format(namespace, tag),
         'manifests': []
     }
     for arch in arch_list:
         info = {
-            'image': f"{namespace}:{tag}-{arch[0]}",
+            'image': "{}:{}-{}".format(namespace, tag, arch[0]),
             'platform': {
                 'architecture': arch[1],
                 'os': arch[3]