From ed4183ccf63fc3102e1fad1d64dde8425f6a96e4 Mon Sep 17 00:00:00 2001
From: devatherock <devatherock@gmail.com>
Date: Mon, 29 May 2023 08:47:59 -0500
Subject: [PATCH] feat: Built a multi-arch docker image

Closes #32
---
 .circleci/config.yml | 37 +++++++++++++++++++++++--------------
 CHANGELOG.md         | 10 +++++++---
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28df94e..8b264d0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,9 +5,6 @@ slack_image: &slack_image
         username: $DOCKER_USERNAME
         password: $DOCKER_PASSWORD
 
-orbs:
-  docker: circleci/docker@2.2.0
-
 work_directory: &work_directory
   working_directory: ~/ldap-search-api
 
@@ -116,6 +113,24 @@ jobs:
       - store_test_results:
           path: build/test-results
           
+  publish:
+    executor: docker-executor
+    steps:
+      - checkout
+      - setup_remote_docker
+      - attach_workspace:
+          at: ~/ldap-search-api
+      - run: |
+          TAG=${CIRCLE_SHA1:0:8}
+          docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+          docker buildx create --name rockbuilder \
+            --driver docker-container --use --bootstrap
+          docker buildx build \
+            --platform linux/amd64,linux/arm64 \
+            --push \
+            -t devatherock/ldap-search-api:$TAG \
+            -t devatherock/ldap-search-api:latest .
+          
   dockerhub_readme:
     machine:
       image: ubuntu-2204:2023.04.2
@@ -153,9 +168,10 @@ jobs:
           TAG=${CIRCLE_TAG#v}
           DEV_TAG=${CIRCLE_SHA1:0:8}
           docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-          docker pull devatherock/ldap-search-api:$DEV_TAG
-          docker tag devatherock/ldap-search-api:$DEV_TAG devatherock/ldap-search-api:$TAG
-          docker push devatherock/ldap-search-api:$TAG
+          docker buildx create --name rockbuilder \
+            --driver docker-container --use --bootstrap
+          docker buildx imagetools create \
+            -t devatherock/ldap-search-api:$TAG devatherock/ldap-search-api:$DEV_TAG
 
   notify:
     <<: *slack_image
@@ -184,18 +200,11 @@ workflows:
             - jumpcloud-credentials
           requires:
             - validate_yamls
-      - docker/publish:
-          name: publish
-          executor: docker-executor
+      - publish:
           context:
             - docker-credentials
           requires:
             - build
-          image: devatherock/ldap-search-api
-          attach-at: ~/ldap-search-api
-          tag: "${CIRCLE_SHA1:0:8},latest"
-          use-remote-docker: true
-          docker-username: DOCKER_USERNAME
       - dockerhub_readme:
           context:
             - docker-credentials
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 33b9131..b1c710c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,13 +2,17 @@
 
 ## [Unreleased]
 ### Added
-- Renovate config
-- [#5](https://github.com/devatherock/ldap-search-api/issues/5): Query parameter to limit number of results
-- [#7](https://github.com/devatherock/ldap-search-api/issues/7): Query parameter to specify the attributes to be returned in the result
 - [#27](https://github.com/devatherock/ldap-search-api/issues/27): Tests for built-in endpoints like `/health`
 
 ### Changed
 - [#30](https://github.com/devatherock/ldap-search-api/issues/30): Updated dockerhub readme in CI pipeline
+- [#32](https://github.com/devatherock/ldap-search-api/issues/32): Built a multi-arch docker image
+
+## [0.5.0] - 2023-05-24
+### Added
+- Renovate config
+- [#5](https://github.com/devatherock/ldap-search-api/issues/5): Query parameter to limit number of results
+- [#7](https://github.com/devatherock/ldap-search-api/issues/7): Query parameter to specify the attributes to be returned in the result
 
 ## [0.4.0] - 2023-05-22
 ### Added