refactor: Dont use buildx, also formatting

1 files changed, 21 insertions, 25 deletions

diff --git a/code/api/build_and_push.sh b/code/api/build_and_push.sh
index dd88916..7e4b2d7 100755
--- a/code/api/build_and_push.sh
+++ b/code/api/build_and_push.sh
@@ -7,11 +7,11 @@ CURRENT_DEV_VERSION_INT=${CURRENT_DEV_VERSION//[!0-9]/}
 CURRENT_VERSION=$(cat .version)
 CURRENT_VERSION_INT=${CURRENT_VERSION//[!0-9]/}
 if [ ${1-prod} == "dev" ]; then
-     NEW_VERSION="v$((CURRENT_DEV_VERSION_INT+1))-server-dev"
-     OLD_VERSION=$CURRENT_DEV_VERSION
+  NEW_VERSION="v$((CURRENT_DEV_VERSION_INT + 1))-server-dev"
+  OLD_VERSION=$CURRENT_DEV_VERSION
 else
-     NEW_VERSION="v$((CURRENT_VERSION_INT+1))-server"
-     OLD_VERSION=$CURRENT_VERSION
+  NEW_VERSION="v$((CURRENT_VERSION_INT + 1))-server"
+  OLD_VERSION=$CURRENT_VERSION
 fi
 IMAGE_NAME="greatoffice/server"
 HUB_NAME="dr.ivar.systems/greatoffice/server"
@@ -27,11 +27,11 @@ if [ "$(git status --untracked-files=no --porcelain)" ]; then
 fi
 
 if [ ${1-prod} == "dev" ]; then
-    echo $NEW_VERSION >| .version-dev
-    git add .version-dev
+  echo $NEW_VERSION >|.version-dev
+  git add .version-dev
 else
-    echo $NEW_VERSION >| .version
-    git add .version
+  echo $NEW_VERSION >|.version
+  git add .version
 fi
 
 echo "Starting build of $HUB_NAME:$NEW_VERSION at $(date -u)..."
@@ -43,40 +43,36 @@ echo "$NEW_VERSION" >version.txt
 git add version.txt
 popd
 
-git commit --quiet -m "chore(release): Bump version";
-
+git commit --quiet -m "chore(release): Bump version"
 
 read -p "Do you want to tag this build? (y/n) " -n 1 -r
 echo
-if [[ $REPLY =~ ^[Yy]$ ]]
-then
-    read -p "Enter tag message (can be empty): " TAG_MESSAGE
-    git tag -am "$TAG_MESSAGE" $NEW_VERSION
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+  read -p "Enter tag message (can be empty): " TAG_MESSAGE
+  git tag -am "$TAG_MESSAGE" $NEW_VERSION
 fi
 
 read -p "Do you want to push the latest commits and tags to origin? (y/n) " -n 1 -r
 echo
-if [[ $REPLY =~ ^[Yy]$ ]]
-then
-    echo "Pushing latest changes to remotes..."
-    echo
-    git push --quiet --follow-tags
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+  echo "Pushing latest changes to remotes..."
+  echo
+  git push --quiet --follow-tags
 fi
 
-
 # Build docker image
 echo "Building docker image"
 echo
 
-docker buildx build --platform linux/amd64 -t $IMAGE_NAME:$NEW_VERSION .
+docker build -t $IMAGE_NAME:$NEW_VERSION .
 
 docker tag $IMAGE_NAME:$NEW_VERSION $HUB_NAME:$NEW_VERSION
 
 if [ ${1-prod} == "dev" ]; then
-    docker tag $IMAGE_NAME:$NEW_VERSION $HUB_NAME:latest-dev
+  docker tag $IMAGE_NAME:$NEW_VERSION $HUB_NAME:latest-dev
 fi
 if [ ${1-prod} == "prod" ]; then
-    docker tag $IMAGE_NAME:$NEW_VERSION $HUB_NAME:latest
+  docker tag $IMAGE_NAME:$NEW_VERSION $HUB_NAME:latest
 fi
 
 # Optionally push images to docker registry
@@ -85,9 +81,9 @@ read -n 1
 docker push $HUB_NAME:$NEW_VERSION
 
 if [ ${1-prod} == "dev" ]; then
-    docker push $HUB_NAME:latest-dev
+  docker push $HUB_NAME:latest-dev
 fi
 
 if [ ${1-prod} == "prod" ]; then
-    docker push $HUB_NAME:latest
+  docker push $HUB_NAME:latest
 fi