From 6369f9d4e07163c22cd9db2e600e3d41268080d0 Mon Sep 17 00:00:00 2001
From: root <root@travis-job-681b848b-0aaa-4e99-a6e1-b45b06b84b6c>
Date: Mon, 23 Nov 2020 19:06:30 +0000
Subject: [PATCH 01/67] changed

---
 .travis.yml                            | 101 +++++++++++----------
 .travis/automated_image_creator.sh     | 114 ------------------------
 .travis/automated_multiarch_creator.sh |  59 -------------
 .travis/ci_image_creator.sh            |  19 ----
 docker/amd64-Dockerfile                |  24 -----
 docker/arm-Dockerfile                  |  24 -----
 docker/arm64-Dockerfile                |  24 -----
 utils.sh                               | 116 +++++++++++++++++++++++++
 8 files changed, 171 insertions(+), 310 deletions(-)
 delete mode 100755 .travis/automated_image_creator.sh
 delete mode 100755 .travis/automated_multiarch_creator.sh
 delete mode 100755 .travis/ci_image_creator.sh
 delete mode 100644 docker/amd64-Dockerfile
 delete mode 100644 docker/arm-Dockerfile
 delete mode 100644 docker/arm64-Dockerfile
 create mode 100644 utils.sh

diff --git a/.travis.yml b/.travis.yml
index 6a5ecea..0ed7736 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,54 +1,63 @@
-_prepare_deploy: &_prepare_deploy
-  before_script:
-  - sudo wget -O /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/1.14.1/yq_linux_amd64
-  - sudo chmod +x /usr/local/bin/yq
-  - sudo wget -O /usr/local/bin/manifest_tool https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64
-  - sudo chmod +x /usr/local/bin/manifest_tool
-#   - export APP_VERSION=0.12.8
-  - export APP_VERSION=$(curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" | grep "tag_name" | cut -d '"' -f 4 | cut -c 2-)
-  - echo $APP_VERSION
-  - export ARM_IMAGE=arm-${APP_VERSION}
-  #- export ARM64_IMAGE=arm64-${APP_VERSION}
-  - export AMD64_IMAGE=amd64-${APP_VERSION}
-  - export ARM_INTERMEDIARY_IMAGE_NAME=treehouses/kolibri-tags:${ARM_IMAGE}
-  #- export ARM64_INTERMEDIARY_IMAGE_NAME=treehouses/kolibri-tags:${ARM64_IMAGE}
-  - export AMD64_INTERMEDIARY_IMAGE_NAME=treehouses/kolibri-tags:${AMD64_IMAGE}
 sudo: required
 addons:
   apt:
     update: true
     packages:
     - docker-ce
-stages:
-- docker-creation
-- multiarch-release
-jobs:
-  include:
-  - stage: docker-creation
-    # For AMD64
-    <<: *_prepare_deploy
-    script:
-    - ./.travis/automated_image_creator.sh -o treehouses -r kolibri-tags -a ${AMD64_IMAGE} -f amd64-Dockerfile -p ./docker
-  - stage: docker-creation
-    # For arm64
-#     <<: *_prepare_deploy
-#     script:
-#     - docker run --rm --privileged multiarch/qemu-user-static:register --reset
-#     - ./.travis/automated_image_creator.sh -o treehouses -r kolibri-tags -a ${ARM64_IMAGE} -f arm64-Dockerfile -p ./docker
-#   - stage: docker-creation
-    # For ARM
-    <<: *_prepare_deploy
-    script:
-    - docker run --rm --privileged multiarch/qemu-user-static:register --reset
-    - ./.travis/automated_image_creator.sh -o treehouses -r kolibri-tags -a ${ARM_IMAGE} -f arm-Dockerfile -p ./docker
-  - stage: multiarch-release
-    <<: *_prepare_deploy
-    script:
-#     - ./.travis/automated_multiarch_creator.sh -o treehouses -r kolibri -a ${APP_VERSION} -m ${ARM_INTERMEDIARY_IMAGE_NAME} -s ${ARM64_INTERMEDIARY_IMAGE_NAME} -d ${AMD64_INTERMEDIARY_IMAGE_NAME}
-    - ./.travis/automated_multiarch_creator.sh -o treehouses -r kolibri -a ${APP_VERSION} -m ${ARM_INTERMEDIARY_IMAGE_NAME} -d ${AMD64_INTERMEDIARY_IMAGE_NAME}
-#     - ./.travis/automated_multiarch_creator.sh -o treehouses -r kolibri -a latest -m ${ARM_INTERMEDIARY_IMAGE_NAME} -s ${ARM64_INTERMEDIARY_IMAGE_NAME} -d ${AMD64_INTERMEDIARY_IMAGE_NAME}
-    - ./.travis/automated_multiarch_creator.sh -o treehouses -r kolibri -a latest -m ${ARM_INTERMEDIARY_IMAGE_NAME} -d ${AMD64_INTERMEDIARY_IMAGE_NAME}
+services:
+- docker
+script:
+- export DOCKER_CLI_EXPERIMENTAL=enabled
+- source utils.sh
+- alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
+- echo $alpine_arm_sha
+- kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
+- echo $kolibri_arm_sha
+- flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
+- echo $flag_arm
+- alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
+- echo $alpine_amd64_sha
+- kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
+- echo $kolibri_amd64_sha
+- flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
+- echo $flag_amd64
+- alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
+- echo $alpine_arm64_sha
+- kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
+- echo $kolibri_arm64_sha
+- flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+- echo $flag_arm64
+- echo $DOCKERAPIKEY | docker login -u "neethumohan1212" --password-stdin
+- docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+- build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri"
+- build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri"
+- build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri"
+- flag=$(compare "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha
+  "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha
+  "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha
+  "neethumohan1212/kolibri:latest" "neethumohan1212/kolibri-tags:amd64")
+- echo $flag
+before_deploy:
+- deploy_image "neethumohan1212/kolibri" arm
+- deploy_image "neethumohan1212/kolibri" amd64
+- deploy_image "neethumohan1212/kolibri" arm64
+- timetag=$(date +%Y%m%d%H%M)
+- echo $timetag
+- tag1="latest"
+- tag2=$timetag
+- echo $tag2
+- create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64
+  neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+- docker manifest inspect neethumohan1212/kolibri:$tag1
+- docker manifest inspect neethumohan1212/kolibri:$tag2
+deploy:
+- provider: script
+  script: docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push
+    neethumohan1212/kolibri:$tag2
+  skip_cleanup: true
+  on:
+    all_branches: true
+    condition: "$flag = true"
 env:
   global:
-  - secure: Hoh9KJs7k0K07NLHAGyvK8s28IH0KwAfITPLOlDzMwsb5x86orGBZ2H+3S9rq0JILoMyUEpbko6/oPmpk5S9OC9/0mWNWecSs3K6UklydAJKDLQc2n5JOKPoAhqkuY6J04IsLdcyQ+FAt3m6sMf4WwUI/6h4nJukT79pBIBqtLWIVIT6ss+P/XAHMsQce3cHf+/hPCH5A8ApQKUT+VDrMs6cS9gIJXBMGjml/7aRO+OTwxhFV6Nb19Z0DpcZ7blPMP+af9g+53NjkYJs8yxFziB5yD0iwU2Sv9RR9TsbYg9SlK7Ltd5K9ESEYTTk02wXjdX0HogUpxCCcfflkIFnmjsVyawWppYwoZG2PjGswfg9wqj78i46vI/ZkxSBZoKhPwLOEssgCRj6AUoWYYLHbw3LqEuuA8fzohrV6gnXWB6J+jIedJyaXkLNWFeSfXPIjIUiLK4WWsA96lFFhDUPcRqblP5581CJ3iMGpoYUFdcyrERZ0/gZJyOXMdE+S/SG3SiRPypEIlZFObn+L6j4d5C4ojzrYIiy40CH5pQ89j1tsBdG+3zv00e71/EJudvA/cwv/GrzL5tMPOJH5oASgz4Ugx8eYUvLDeWCqkBCFuYNTv0NVcAJx1eiaJ61V76qj4RtqcjMfFeeLA9h5Y4vFMFISEIW+asWVfJIQz9n8As=
-  - secure: RuSVMvQh7vNSCesh+80b+3mfRcVeGQ+DoQWqBssZH0QQ/jp6yDbTinParOsCKLSwhPIfSR1BOgyj6l6BtnUtS/17j3L+Y1BkB+Os/UN2h4JlQrmJeIVlFHf2+8Wff6GDWB9I0tLGtol7Fva+sGAK/HxwFqDQKUfLjusQ9qLHJiLlsl7QLMu/zLqAJY/QuPZSFfc+gougzdW/C4whQm1fled4vIC01zW9P8rVow07/mqJFUoDrtoAcMnylaYlkq9hikH2knNwCEjvF1Qk9o206E+NwQAqJT+O1qSPtFgdUYneNUHCB8zrkRUqvCyO7Wh3NJ7xhe6AELqjLRxqZ4bMkR7JXMYY3J2SMUaSSh5Us1p2CydBqcgHqlXnhlPMkH4TgAGEH8ZT3/yolrMZYTGmt5aYgVTuFpy6r8niVU4NnhRnSEVybtex+LO4smX2MYShDtf9caSqAFt+ck6ZhymhSAryRGh1a53nahdMm4C8SXrApUgLLIXkhKYNscUCI6M6jXA1o7ljB2xAGTcl5PtBQIFC8/4KmTRFfnW1F36heqLl4NTdWRd4D51kIHZKjxecLXL5CGWyReYZrF/jo1XavrdbLaNvAE9SZDVKRAsc48yKHWzC75UYUvlEB5P9NvFNuEHneshTKAJygldtQYwsAZn1EIZt4WKd4bh9EtmGtwg=
+  - secure: QYa0ylNHvZQovle8c4+cR4i23tZ6NUaf/iYepLpuxKt3fRTvLRdDQs0tPgfTUVQtkQqYaNM/J6n+LaML+Wc5blBiKafUd8wDYUIfIKwguYBwNFZwYEy2WfaVSj4sNgPXaOc4iu7Im5pi6eeXmjSINuG2/eOVVQEtz6ST/WvIbA6Jr4oZ68P6b8H2VJxMd2RTAVG6BH+2BaeBy/l/hAGAk97mo1Ji1UIXPnC3pTM1ZDDEHPog24j0OziAkKOdKdBY9FXWeWKTISZOGcjVW8PN6RRMuENGw6+yPNhk7A8IQTvk1B23gvtCH81N8M5Igu7MfFZHg2+mHkvYVwHeVvQXJdBNUq4Bv0wQn66Buqo8+Je9jGtWyUZzy7xyFQA47BWfwKGqqTAqTOdlYruaak7UqhwQLMeX5terKy5nfgw4gJ8JYqk5KL3HnTym4yNXc2DhZgVOWuh5sqET+JN2+xA72QjWyIkP/RCIzZDHbPYqQjLlKwqdviYJFdJeeRpPnKDS1eeRojd0WL3y42ACdFDxndN2LQ2umQL+HOtomZB+gVRjrbuSbyecbDEVxRjifQYzJthRtmzCUReUmZE9FB9xxRjV/0+Enfr2tZJmXn+C1reTDZp+kvy9pdbWcBW9FDRGLHCubeloHKT05b7PpyM0RRfNGQIgpDTcAxMT1FbfnjI=
diff --git a/.travis/automated_image_creator.sh b/.travis/automated_image_creator.sh
deleted file mode 100755
index aa4125f..0000000
--- a/.travis/automated_image_creator.sh
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/usr/bin/env bash
-
-# Examples:
-# ./automated_image_creator.sh -o ole -r base -a debian -p ./base_debian
-while getopts "o:r:a:p:f:" option; do
-  case "$option" in
-    o) DOCKER_ORG=${OPTARG};;
-    r) DOCKER_REPO=${OPTARG};;
-    a) IMAGE_ALIAS=${OPTARG};;
-    p) IMAGE_BUILD_TARGET_PATH=${OPTARG};;
-    f) IMAGE_DOCKERFILE=${OPTARG};;
-  esac
-done
-
-login_docker() {
-    if [[ -z "$DOCKER_USER" ]] || [[ -z "$DOCKER_PASS" ]]; then
-        echo 'Either DOCKER_USER or DOCKER_PASS environment variable does not exist, please set it up in pipeline setting!'
-        exit 1
-    fi
-    docker login --username="$DOCKER_USER" --password="$DOCKER_PASS"
-}
-
-fallback_env() {
-    local TARGET_VARIABLE="$1"
-    local FALLBACK_VALUE="$2"
-    local CURRENT_VALUE=$(env | grep "^${TARGET_VARIABLE}=" | awk -F '=' '{print $2}')
-
-    echo "${CURRENT_VALUE}"
-
-    if [[ -z "$CURRENT_VALUE" ]]; then
-        echo "${TARGET_VARIABLE} is not set and will defaulting to ${FALLBACK_VALUE}"
-        eval "export ${TARGET_VARIABLE}=${FALLBACK_VALUE}"
-    fi
-}
-
-package_image() {
-    local BRANCH=${1}
-    local IMAGE_NAME=${2}
-    local IMAGE_NAME_LATEST=${3}
-
-    echo "== Packing image"
-    echo processing ${IMAGE_NAME}
-    if [ ! -z ${IMAGE_DOCKERFILE} ]; then
-        docker build -t ${IMAGE_NAME} -f ${IMAGE_BUILD_TARGET_PATH}/${IMAGE_DOCKERFILE} ${IMAGE_BUILD_TARGET_PATH} || exit 1
-    else
-        docker build -t ${IMAGE_NAME} ${IMAGE_BUILD_TARGET_PATH} || exit 1
-    fi
-    echo done processing ${IMAGE_NAME}
-    if [ ${BRANCH} = "master" ]
-    then
-        echo processing ${IMAGE_NAME_LATEST}
-        docker tag ${IMAGE_NAME} ${IMAGE_NAME_LATEST}
-        echo done processing ${IMAGE_NAME_LATEST}
-    fi
-}
-
-push_image() {
-    local BRANCH=${1}
-    local IMAGE_NAME=${2}
-    local IMAGE_NAME_LATEST=${3}
-
-    echo "== Pushing image"
-    echo processing ${IMAGE_NAME}
-    docker push ${IMAGE_NAME}
-    echo done processing ${IMAGE_NAME}
-    if [ ${BRANCH} = "master" ]; then
-        echo processing ${IMAGE_NAME_LATEST}
-        docker push ${IMAGE_NAME_LATEST}
-        echo done processing ${IMAGE_NAME_LATEST}
-    fi
-}
-
-delete_image() {
-    local BRANCH=${1}
-    local IMAGE_NAME=${2}
-    local IMAGE_NAME_LATEST=${3}
-
-    echo "== Deleting image"
-    echo processing ${IMAGE_NAME}
-    docker rmi -f ${IMAGE_NAME}
-    echo done processing ${IMAGE_NAME}
-    if [ ${BRANCH} = "master" ]; then
-        echo processing ${IMAGE_NAME_LATEST}
-        docker rmi -f ${IMAGE_NAME_LATEST}
-        echo done processing ${IMAGE_NAME_LATEST}
-    fi
-}
-
-main() {
-    local BRANCH=$(if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then echo ${TRAVIS_BRANCH}; else echo ${TRAVIS_PULL_REQUEST_BRANCH}; fi)
-    local COMMIT=$(git rev-parse --short HEAD)
-
-    if [[ ! -z ${IMAGE_ALIAS} ]]; then
-        IMAGE_ALIAS_WITH_SEPARATOR=${IMAGE_ALIAS}-
-        IMAGE_LATEST_TAG=${IMAGE_ALIAS}
-    else
-        IMAGE_ALIAS_WITH_SEPARATOR=""
-        IMAGE_LATEST_TAG="latest"
-    fi
-
-    local IMAGE_NAME=${DOCKER_ORG}/${DOCKER_REPO}:${IMAGE_ALIAS_WITH_SEPARATOR}${BRANCH}-${COMMIT}
-    local IMAGE_NAME_LATEST=${DOCKER_ORG}/${DOCKER_REPO}:${IMAGE_LATEST_TAG}
-
-    echo Full name: ${IMAGE_NAME}
-    echo Full latest name: ${IMAGE_NAME_LATEST}
-    echo Build path: ${IMAGE_BUILD_TARGET_PATH}
-    login_docker
-    package_image ${BRANCH} ${IMAGE_NAME} ${IMAGE_NAME_LATEST}
-    push_image ${BRANCH} ${IMAGE_NAME} ${IMAGE_NAME_LATEST}
-    docker logout
-    delete_image ${BRANCH} ${IMAGE_NAME} ${IMAGE_NAME_LATEST}
-}
-
-main
diff --git a/.travis/automated_multiarch_creator.sh b/.travis/automated_multiarch_creator.sh
deleted file mode 100755
index d49ad5b..0000000
--- a/.travis/automated_multiarch_creator.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-# Examples:
-# ./automated_multiarch_creator.sh -o treehouses -r kolibri -a 0.10.3 -m arm -s arm64 -d amd64
-while getopts "o:r:a:m:s:d:" option; do
-  case "$option" in
-    o) DOCKER_ORG=${OPTARG};;
-    r) DOCKER_REPO=${OPTARG};;
-    a) IMAGE_ALIAS=${OPTARG};;
-    m) ARM_IMAGE=${OPTARG};;
-    s) ARM64_IMAGE=${OPTARG};;
-    d) AMD64_IMAGE=${OPTARG};;
-  esac
-done
-
-create_multiarch_manifest(){
-    # FIXME: make architecture dynamic
-    local TARGET_IMAGE=${1}
-    local ARM_IMAGE=${2}
-    local AMD64_IMAGE=${3}
-#     local ARM64_IMAGE=${4}
-    echo Creating multiarch manifest
-    {
-        yq n image ${TARGET_IMAGE} | \
-        yq w - manifests[0].image ${ARM_IMAGE} | \
-        yq w - manifests[0].platform.architecture arm | \
-        yq w - manifests[0].platform.os linux | \
-        yq w - manifests[1].image ${AMD64_IMAGE} | \
-        yq w - manifests[1].platform.architecture amd64 | \
-        yq w - manifests[1].platform.os linux | \
-#         yq w - manifests[2].image ${ARM64_IMAGE} | \
-#         yq w - manifests[2].platform.architecture arm64 | \
-#         yq w - manifests[2].platform.os linux | \
-        tee ma_manifest.yaml
-    }
-}
-
-deploy_multiarch_manifest(){
-    echo Pushing Multiarch Manifests to cloud
-    manifest_tool push from-spec ma_manifest.yaml
-    echo Successfully Pushed Multiarch Manifests to cloud
-
-}
-
-main(){
-    docker login --username="$DOCKER_USER" --password="$DOCKER_PASS"
-    local TARGET_IMAGE=${DOCKER_ORG}/${DOCKER_REPO}:${IMAGE_ALIAS}
-    local BRANCH=$(if [ ${TRAVIS_PULL_REQUEST} == "false" ]; then echo ${TRAVIS_BRANCH}; else echo ${TRAVIS_PULL_REQUEST_BRANCH}; fi)
-    if [ "$BRANCH" = "master" ]; then
-#         create_multiarch_manifest ${TARGET_IMAGE} ${ARM_IMAGE} ${AMD64_IMAGE} ${ARM64_IMAGE}
-        create_multiarch_manifest ${TARGET_IMAGE} ${ARM_IMAGE} ${AMD64_IMAGE}
-        deploy_multiarch_manifest
-    else
-        echo Branch is NOT master so no need to push multiarch manifests to registry!
-    fi
-    docker logout
-}
-
-main
diff --git a/.travis/ci_image_creator.sh b/.travis/ci_image_creator.sh
deleted file mode 100755
index 4dfdb6e..0000000
--- a/.travis/ci_image_creator.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Examples:
-# ./ci_image_creator.sh -p ./base_debian
-while getopts "p:" option; do
-  case "$option" in
-    p) IMAGE_BUILD_TARGET_PATH=${OPTARG};
-  esac
-done
-
-main() {
-    local DOCKER_ORG=$(grep "^DOCKER_IMAGE_NAME=" ${IMAGE_BUILD_TARGET_PATH}/docker.env | awk -F '=' '{print $2}' | sed -e 's/^"//' -e 's/"$//' | awk -F '/' '{print $1}')
-    local DOCKER_REPO=$(grep "^DOCKER_IMAGE_NAME=" ${IMAGE_BUILD_TARGET_PATH}/docker.env | awk -F '=' '{print $2}' | sed -e 's/^"//' -e 's/"$//' | awk -F '/' '{print $2}' | awk -F ':' '{print $1}')
-    local IMAGE_ALIAS=$(grep "^DOCKER_IMAGE_NAME=" ${IMAGE_BUILD_TARGET_PATH}/docker.env | awk -F '=' '{print $2}' | sed -e 's/^"//' -e 's/"$//' | awk -F '/' '{print $2}' | awk -F ':' '{print $2}')
-
-    ./.travis/automated_image_creator.sh -o ${DOCKER_ORG} -r ${DOCKER_REPO} -a ${IMAGE_ALIAS} -p ${IMAGE_BUILD_TARGET_PATH}
-}
-
-main
diff --git a/docker/amd64-Dockerfile b/docker/amd64-Dockerfile
deleted file mode 100644
index 9080635..0000000
--- a/docker/amd64-Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM alpine:latest
-
-#install python
-RUN apk update && apk add \
-    python \
-    curl
-
-#no need to add cleaning command as alpine cleans package automatically
-
-#download the latest kolibri
-RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" \
-    | grep "browser_download_url.*pex" \
-    | cut -d '"' -f 4 \
-    | xargs curl -o kolibri -L
-
-#make executable
-RUN chmod +x kolibri
-
-#used for storing db and content (used when mounting volume)
-RUN mkdir /root/.kolibri
-
-EXPOSE 8080
-
-CMD ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt
diff --git a/docker/arm-Dockerfile b/docker/arm-Dockerfile
deleted file mode 100644
index a89bee2..0000000
--- a/docker/arm-Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM multiarch/alpine:armhf-latest-stable
-
-#install python
-RUN apk update && apk add \
-    python \
-    curl
-
-#no need to add cleaning command as alpine cleans package automatically
-
-#download the latest
-RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" \
-    | grep "browser_download_url.*pex" \
-    | cut -d '"' -f 4 \
-    | xargs curl -o kolibri -L
-
-#make executable
-RUN chmod +x kolibri
-
-#used for storing db and content (used when mounting volume)
-RUN mkdir /root/.kolibri
-
-EXPOSE 8080
-
-CMD ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt
diff --git a/docker/arm64-Dockerfile b/docker/arm64-Dockerfile
deleted file mode 100644
index c9df3df..0000000
--- a/docker/arm64-Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM multiarch/alpine:aarch64-latest-stable
-
-#install python
-RUN apk update && apk add \
-    python \
-    curl
-
-#no need to add cleaning command as alpine cleans package automatically
-
-#download kolibri
-RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" \
-    | grep "browser_download_url.*pex" \
-    | cut -d '"' -f 4 \
-    | xargs curl -o kolibri -L
-    
-#make executable
-RUN chmod +x kolibri
-
-#used for storing db and content (used when mounting volume)
-RUN mkdir /root/.kolibri
-
-EXPOSE 8080
-
-CMD ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt
diff --git a/utils.sh b/utils.sh
new file mode 100644
index 0000000..838a773
--- /dev/null
+++ b/utils.sh
@@ -0,0 +1,116 @@
+get_manifest_sha() {
+  local repo=$1
+  local arch=$2
+  docker pull -q $1 &>/dev/null
+  docker manifest inspect $1 > "$2".txt
+  sha=""
+  i=0
+  while [ "$sha" == "" ] && read -r line; do
+    architecture=$(jq .manifests[$i].platform.architecture "$2".txt |sed -e 's/^"//' -e 's/"$//')
+    if [ "$architecture" = "$2" ];then
+      sha=$(jq .manifests[$i].digest "$2".txt  |sed -e 's/^"//' -e 's/"$//')
+      echo ${sha}
+    fi
+    i=$i+1
+  done < "$2".txt
+}
+
+get_sha() {
+  repo=$1
+  docker pull $1 &>/dev/null
+  sha=$(docker image inspect $1 | jq --raw-output '.[0].RootFS.Layers|.[]')   # [0] means first element of list,[]means all the elments of lists
+  echo $sha
+}
+
+is_base() {
+  local base_sha    # alpine
+  local image_sha   # new image
+  local base_repo=$1
+  local image_repo=$2
+
+  base_sha=$(get_sha $base_repo)
+  image_sha=$(get_sha $image_repo)
+
+  for i in $base_sha; do
+    local found="false"
+    for j in $image_sha; do
+      if [[ $i = $j ]]; then
+        found="true"
+        break
+      fi
+    done
+    if [ $found == "false" ]; then
+      echo "false"
+      return 0
+    fi
+  done
+  echo "true"
+}
+
+image_version() {
+  local version
+  repo=$1    # nginx repo
+  version=$(docker run -it $1 /bin/sh -c "nginx -v" |awk '{print$3}')
+  echo $version
+}
+
+compare() {
+  result_arm=$(is_base $1 $2)
+  result_arm64=$(is_base $3 $4)
+  result_amd64=$(is_base $5 $6)
+  if [ $result_arm == "false" ] || [ $result_amd64 == "false" ] || [ $result_arm64 == "false" ];
+  then
+    echo "true"
+  else
+    echo "false"
+  fi
+}
+
+create_manifest() {
+  local repo=$1
+  local tag1=$2
+  local tag2=$3
+  local x86=$4
+  local rpi=$5
+  local arm64=$6
+  docker manifest create $repo:$tag1 $x86 $rpi $arm64
+  docker manifest create $repo:$tag2 $x86 $rpi $arm64
+  docker manifest annotate $repo:$tag1 $x86 --arch amd64
+  docker manifest annotate $repo:$tag1 $rpi --arch arm
+  docker manifest annotate $repo:$tag1 $arm64 --arch arm64
+  docker manifest annotate $repo:$tag2 $x86 --arch amd64
+  docker manifest annotate $repo:$tag2 $rpi --arch arm
+  docker manifest annotate $repo:$tag2 $arm64 --arch arm64
+}
+
+build_image(){
+  local repo=$1  # this is the base repo, for example treehouses/alpine
+  local arch=$2  #arm arm64 amd64
+  local tag_repo=$3  # this is the tag repo, for example treehouses/node
+  if [ $# -le 1 ]; then
+    echo "missing parameters."
+    exit 1
+  fi
+  sha=$(get_manifest_sha $@)
+  echo $sha
+  base_image="$repo@$sha"
+  echo $base_image
+  if [ -n "$sha" ]; then
+    tag=$tag_repo-tags:$arch
+    sed "s|{{base_image}}|$base_image|g" Dockerfile.template > Dockerfile.$arch
+    docker build -t $tag -f Dockerfile.$arch .
+  fi
+}
+
+deploy_image(){
+  local repo=$1
+  local arch=$2  #arm arm64 amd64
+  tag_arch=$repo-tags:$arch
+  tag_time=$(date +%Y%m%d%H%M)
+  tag_arch_time=$repo-tags:$arch-$tag_time
+  echo $tag_arch_time
+  docker tag $tag_arch $tag_arch_time
+  docker push $tag_arch_time
+  docker tag $tag_arch_time $tag_arch
+  docker push $tag_arch
+}
\ No newline at end of file

From ec3704672165ebe3993f6548464a262ccea8a0f8 Mon Sep 17 00:00:00 2001
From: root <root@travis-job-681b848b-0aaa-4e99-a6e1-b45b06b84b6c>
Date: Mon, 23 Nov 2020 19:16:19 +0000
Subject: [PATCH 02/67] updated

---
 Dockerfile.template | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 Dockerfile.template

diff --git a/Dockerfile.template b/Dockerfile.template
new file mode 100644
index 0000000..78dedfb
--- /dev/null
+++ b/Dockerfile.template
@@ -0,0 +1,11 @@
+
+FROM {{base_image}}
+
+RUN apt-get update -y   && apt-get install -y apache2
+
+RUN mkdir /var/run/apache2
+
+EXPOSE 80
+
+CMD ["-D","FOREGROUND"]
+ENTRYPOINT ["/usr/sbin/apache2ctl"]
\ No newline at end of file

From 99e73fc877805af71543be8393d819b748722fba Mon Sep 17 00:00:00 2001
From: root <root@travis-job-681b848b-0aaa-4e99-a6e1-b45b06b84b6c>
Date: Mon, 23 Nov 2020 19:28:03 +0000
Subject: [PATCH 03/67] updated

---
 Dockerfile.template | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index 78dedfb..5d90371 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,11 +1,24 @@
-
 FROM {{base_image}}
 
-RUN apt-get update -y   && apt-get install -y apache2
+#install python
+RUN apk update && apk add \
+    python \
+    curl
+
+#no need to add cleaning command as alpine cleans package automatically
+
+#download the latest
+RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" \
+    | grep "browser_download_url.*pex" \
+    | cut -d '"' -f 4 \
+    | xargs curl -o kolibri -L
+
+#make executable
+RUN chmod +x kolibri
 
-RUN mkdir /var/run/apache2
+#used for storing db and content (used when mounting volume)
+RUN mkdir /root/.kolibri
 
-EXPOSE 80
+EXPOSE 8080
 
-CMD ["-D","FOREGROUND"]
-ENTRYPOINT ["/usr/sbin/apache2ctl"]
\ No newline at end of file
+CMD ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt
\ No newline at end of file

From 55f4853d041bb52d42575ed09699d073675efaba Mon Sep 17 00:00:00 2001
From: root <root@travis-job-681b848b-0aaa-4e99-a6e1-b45b06b84b6c>
Date: Mon, 23 Nov 2020 19:30:53 +0000
Subject: [PATCH 04/67] updated

---
 Dockerfile.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index 5d90371..bccb110 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -2,7 +2,7 @@ FROM {{base_image}}
 
 #install python
 RUN apk update && apk add \
-    python \
+    python3 \
     curl
 
 #no need to add cleaning command as alpine cleans package automatically

From 49e22d63946a3d0d0782e44644b62716657dedf4 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Tue, 24 Nov 2020 00:44:03 +0400
Subject: [PATCH 05/67] Update Dockerfile.template

---
 Dockerfile.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index bccb110..b546ca3 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM {{base_image}}
+FROM treehouses/alpine
 
 #install python
 RUN apk update && apk add \
@@ -21,4 +21,4 @@ RUN mkdir /root/.kolibri
 
 EXPOSE 8080
 
-CMD ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt
\ No newline at end of file
+CMD ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt

From e6ee25cb22516c590de506f6a50089a0cf4b4733 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Tue, 24 Nov 2020 01:38:43 +0400
Subject: [PATCH 06/67] Update Dockerfile.template

---
 Dockerfile.template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index b546ca3..34aae52 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM treehouses/alpine
+FROM {{base_image}}
 
 #install python
 RUN apk update && apk add \
@@ -7,14 +7,15 @@ RUN apk update && apk add \
 
 #no need to add cleaning command as alpine cleans package automatically
 
-#download the latest
+#download the latest kolibri
 RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" \
     | grep "browser_download_url.*pex" \
     | cut -d '"' -f 4 \
     | xargs curl -o kolibri -L
 
-#make executable
-RUN chmod +x kolibri
+#make executable and fix alpine
+RUN chmod +x kolibri && \
+    ln -sn /usr/bin/python3 /usr/bin/python
 
 #used for storing db and content (used when mounting volume)
 RUN mkdir /root/.kolibri

From 8d78c287f0a9d4ff5872697e654102e64db6685e Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Tue, 24 Nov 2020 02:12:11 +0400
Subject: [PATCH 07/67] Update .travis.yml

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0ed7736..c26e6bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,12 +32,10 @@ script:
 - build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri"
 - build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri"
 - build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri"
-- flag=$(compare "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha
-  "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha
-  "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha
-  "neethumohan1212/kolibri:latest" "neethumohan1212/kolibri-tags:amd64")
+- flag=$(compare "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+- flag=true
 - echo $flag
-before_deploy:
+- before_deploy:
 - deploy_image "neethumohan1212/kolibri" arm
 - deploy_image "neethumohan1212/kolibri" amd64
 - deploy_image "neethumohan1212/kolibri" arm64

From b12a0fab61be376613ed47a77b874725ce9e4f71 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Tue, 24 Nov 2020 02:17:38 +0400
Subject: [PATCH 08/67] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c26e6bc..5ea9ba9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ script:
 - build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri"
 - build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri"
 - flag=$(compare "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
-- flag=true
+- flag="true"
 - echo $flag
 - before_deploy:
 - deploy_image "neethumohan1212/kolibri" arm

From eda7c813b520c368baf1ada361f7b05ec6b3264d Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Wed, 25 Nov 2020 20:05:22 +0400
Subject: [PATCH 09/67] Update Dockerfile.template

---
 Dockerfile.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index 34aae52..0987c74 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -11,7 +11,7 @@ RUN apk update && apk add \
 RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" \
     | grep "browser_download_url.*pex" \
     | cut -d '"' -f 4 \
-    | xargs curl -o kolibri -L
+    | curl -o kolibri -L
 
 #make executable and fix alpine
 RUN chmod +x kolibri && \

From c92194e06d060a7a73a5e3a13164dbb0de4da032 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Wed, 25 Nov 2020 22:44:03 +0400
Subject: [PATCH 10/67] Update Dockerfile.template

---
 Dockerfile.template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index 0987c74..34aae52 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -11,7 +11,7 @@ RUN apk update && apk add \
 RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/releases/latest" \
     | grep "browser_download_url.*pex" \
     | cut -d '"' -f 4 \
-    | curl -o kolibri -L
+    | xargs curl -o kolibri -L
 
 #make executable and fix alpine
 RUN chmod +x kolibri && \

From f3ba2d216471bc05599c26b736c81e4af67e3591 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Thu, 26 Nov 2020 12:02:25 +0400
Subject: [PATCH 11/67] Update Dockerfile.template

---
 Dockerfile.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index 34aae52..d021464 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -14,8 +14,8 @@ RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/release
     | xargs curl -o kolibri -L
 
 #make executable and fix alpine
-RUN chmod +x kolibri && \
-    ln -sn /usr/bin/python3 /usr/bin/python
+#RUN chmod +x kolibri && \
+    #ln -sn /usr/bin/python3 /usr/bin/python
 
 #used for storing db and content (used when mounting volume)
 RUN mkdir /root/.kolibri

From 677b3c5d0afca032a0fac1b7f7b19b8261932439 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Thu, 26 Nov 2020 12:21:35 +0400
Subject: [PATCH 12/67] Update .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5ea9ba9..e5ffb78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ script:
 - flag=$(compare "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
 - flag="true"
 - echo $flag
-- before_deploy:
+before_deploy:
 - deploy_image "neethumohan1212/kolibri" arm
 - deploy_image "neethumohan1212/kolibri" amd64
 - deploy_image "neethumohan1212/kolibri" arm64

From 63fc40458d6052baa544c37883db2b01f0187a27 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Thu, 26 Nov 2020 12:27:20 +0400
Subject: [PATCH 13/67] Update Dockerfile.template

---
 Dockerfile.template | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index d021464..ad6313d 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -16,10 +16,13 @@ RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/release
 #make executable and fix alpine
 #RUN chmod +x kolibri && \
     #ln -sn /usr/bin/python3 /usr/bin/python
+    
+#make executable and fix alpine
+#RUN chmod +x kolibri
 
 #used for storing db and content (used when mounting volume)
 RUN mkdir /root/.kolibri
 
 EXPOSE 8080
 
-CMD ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt
+CMD python3 ./kolibri start && tail -f /root/.kolibri/logs/kolibri.txt

From abeb5a3ed4203ab2c0cd4a6d4f93822c80f9e3cc Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Thu, 26 Nov 2020 12:46:53 +0400
Subject: [PATCH 14/67] Update Dockerfile.template

---
 Dockerfile.template | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Dockerfile.template b/Dockerfile.template
index ad6313d..d9848ab 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -14,11 +14,7 @@ RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/release
     | xargs curl -o kolibri -L
 
 #make executable and fix alpine
-#RUN chmod +x kolibri && \
-    #ln -sn /usr/bin/python3 /usr/bin/python
-    
-#make executable and fix alpine
-#RUN chmod +x kolibri
+RUN chmod +x kolibri
 
 #used for storing db and content (used when mounting volume)
 RUN mkdir /root/.kolibri

From 56f29343df3aa6bba4d027b4fa4aa5949fade654 Mon Sep 17 00:00:00 2001
From: root <root@travis-job-681b848b-0aaa-4e99-a6e1-b45b06b84b6c>
Date: Fri, 27 Nov 2020 14:26:26 +0000
Subject: [PATCH 15/67] updated

---
 .travis.yml         | 12 +++++-------
 Dockerfile.template |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e5ffb78..b4d4512 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,20 +29,18 @@ script:
 - echo $flag_arm64
 - echo $DOCKERAPIKEY | docker login -u "neethumohan1212" --password-stdin
 - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-- build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri"
-- build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri"
-- build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri"
-- flag=$(compare "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+- build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
+- build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
+- build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
+- flag=$(change $flag_arm $flag_arm64 $flag_amd64)
 - flag="true"
 - echo $flag
 before_deploy:
 - deploy_image "neethumohan1212/kolibri" arm
 - deploy_image "neethumohan1212/kolibri" amd64
 - deploy_image "neethumohan1212/kolibri" arm64
-- timetag=$(date +%Y%m%d%H%M)
-- echo $timetag
 - tag1="latest"
-- tag2=$timetag
+- tag2=$(date +%Y%m%d%H%M)
 - echo $tag2
 - create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64
   neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
diff --git a/Dockerfile.template b/Dockerfile.template
index d9848ab..cfe4f10 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -13,7 +13,7 @@ RUN curl --silent "https://api.github.com/repos/learningequality/kolibri/release
     | cut -d '"' -f 4 \
     | xargs curl -o kolibri -L
 
-#make executable and fix alpine
+#make executable
 RUN chmod +x kolibri
 
 #used for storing db and content (used when mounting volume)

From 14bed2d2c8d9b832fb6405ce6734bdcc2cefb6b1 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Fri, 27 Nov 2020 18:41:56 +0400
Subject: [PATCH 16/67] Update utils.sh

---
 utils.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils.sh b/utils.sh
index 838a773..42b71a1 100644
--- a/utils.sh
+++ b/utils.sh
@@ -54,11 +54,11 @@ image_version() {
   echo $version
 }
 
-compare() {
-  result_arm=$(is_base $1 $2)
-  result_arm64=$(is_base $3 $4)
-  result_amd64=$(is_base $5 $6)
-  if [ $result_arm == "false" ] || [ $result_amd64 == "false" ] || [ $result_arm64 == "false" ];
+change() {
+  flag_arm=$1
+  flag_arm64=$2
+  flag_amd64=$3
+  if [ $flag_arm == "false" ] || [ $flag_arm64 == "false" ] || [ $flag_amd64 == "false" ];
   then
     echo "true"
   else
@@ -113,4 +113,4 @@ deploy_image(){
   docker push $tag_arch_time
   docker tag $tag_arch_time $tag_arch
   docker push $tag_arch
-}
\ No newline at end of file
+}

From 044046c827fda23e4133e0897d522e2c4d811d3a Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Fri, 23 Apr 2021 21:29:54 -0400
Subject: [PATCH 17/67] Create kolibri.yml

---
 .github/workflows/kolibri.yml | 36 +++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/workflows/kolibri.yml

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
new file mode 100644
index 0000000..6a2b91b
--- /dev/null
+++ b/.github/workflows/kolibri.yml
@@ -0,0 +1,36 @@
+# This is a basic workflow to help you get started with Actions
+
+name: CI
+
+# Controls when the action will run. 
+on:
+  # Triggers the workflow on push or pull request events but only for the master branch
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      # Runs a single command using the runners shell
+      - name: Run a one-line script
+        run: echo Hello, world!
+
+      # Runs a set of commands using the runners shell
+      - name: Run a multi-line script
+        run: |
+          echo Add other actions to build,
+          echo test, and deploy your project.

From b81000195b4a2ebc22a41a820e83217e36b65d84 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 23 Apr 2021 22:30:34 -0400
Subject: [PATCH 18/67] version1

---
 .github/workflows/kolibri.yml | 39 ++++++++++++-----------------------
 utils.sh                      |  2 +-
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 6a2b91b..bfc988c 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -1,36 +1,23 @@
-# This is a basic workflow to help you get started with Actions
+name: kolibri-docker-image-build
 
-name: CI
-
-# Controls when the action will run. 
 on:
-  # Triggers the workflow on push or pull request events but only for the master branch
   push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+  repository_dispatch:
+    types: kolibri
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      # Runs a single command using the runners shell
-      - name: Run a one-line script
-        run: echo Hello, world!
-
-      # Runs a set of commands using the runners shell
-      - name: Run a multi-line script
+      - name: checkout code
+        uses: actions/checkout@v2
+      - name: docker login
+        run: docker login -u ${{ secrets.DOCKERUSERNAME }} -p ${{ secrets.DOCKERAPIKEY }}
+      - name: treehouses kolibri
         run: |
-          echo Add other actions to build,
-          echo test, and deploy your project.
+          export DOCKER_CLI_EXPERIMENTAL=enabled
+          source utils.sh
+          alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
+          echo $alpine_arm_sha
diff --git a/utils.sh b/utils.sh
index 42b71a1..e1b54f5 100644
--- a/utils.sh
+++ b/utils.sh
@@ -113,4 +113,4 @@ deploy_image(){
   docker push $tag_arch_time
   docker tag $tag_arch_time $tag_arch
   docker push $tag_arch
-}
+}
\ No newline at end of file

From 7833f1c1c4658dc9a477f6795e4fc0a51ab067d3 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Fri, 23 Apr 2021 22:34:30 -0400
Subject: [PATCH 19/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index bfc988c..52f7e7f 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v2
       - name: docker login
         run: docker login -u ${{ secrets.DOCKERUSERNAME }} -p ${{ secrets.DOCKERAPIKEY }}
-      - name: treehouses kolibri
+      - name: neethumohan1212 kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
           source utils.sh

From da8eb6c75e42c8d8aec46c2f1b103aaa3ced40ef Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 23 Apr 2021 22:48:18 -0400
Subject: [PATCH 20/67] version2

---
 .github/workflows/kolibri.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index bfc988c..e730677 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -21,3 +21,7 @@ jobs:
           source utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
+          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
+          echo $kolibri_arm_sha
+          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
+          echo $flag_arm

From e33a2954c6868e6ef356ce4fcc4d4a06afa1c4b4 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 23 Apr 2021 23:26:59 -0400
Subject: [PATCH 21/67] version3

---
 .github/workflows/kolibri.yml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 82b0d13..6bab887 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -25,3 +25,35 @@ jobs:
           echo $kolibri_arm_sha
           flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
           echo $flag_arm
+          alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
+          echo $alpine_amd64_sha
+          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
+          echo $kolibri_amd64_sha
+          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
+          echo $flag_amd64
+          alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
+          echo $alpine_arm64_sha
+          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
+          echo $kolibri_arm64_sha
+          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+          echo $flag_arm64
+          echo $DOCKERAPIKEY | docker login -u "neethumohan1212" --password-stdin
+          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+          build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
+          build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
+          build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
+          flag=$(change $flag_arm $flag_arm64 $flag_amd64)
+          flag="true"
+          echo $flag
+          tag="0.12.8-$(date +%Y%m%d%H%M)"
+          tag2="latest"
+          echo $tag
+          create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64
+  neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest inspect neethumohan1212/kolibri:$tag1
+          docker manifest inspect neethumohan1212/kolibri:$tag2
+          if [[ $flag == true ]]; then
+            docker manifest push neethumohan1212:$tag; docker manifest push neethumohan1212:$tag2
+          else
+            echo "no changes"
+          fi

From e3a142962b295da93d0eea25665b8baeca87dbee Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Fri, 23 Apr 2021 23:29:51 -0400
Subject: [PATCH 22/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 6bab887..b517db5 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,8 +48,7 @@ jobs:
           tag="0.12.8-$(date +%Y%m%d%H%M)"
           tag2="latest"
           echo $tag
-          create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64
-  neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then

From a8758a0cf66affd488b20939e8aa4db5943d8d43 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 23 Apr 2021 23:44:19 -0400
Subject: [PATCH 23/67] version3

---
 .github/workflows/kolibri.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 6bab887..0af8c88 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -18,6 +18,7 @@ jobs:
       - name: neethumohan1212 kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
+          repo="neethumohan1212/kolibri"
           source utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
@@ -45,11 +46,10 @@ jobs:
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
-          tag="0.12.8-$(date +%Y%m%d%H%M)"
-          tag2="latest"
-          echo $tag
-          create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64
-  neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          tag1="latest"
+          tag2="0.12.8-$(date +%Y%m%d%H%M)"
+          echo $tag2
+          docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then

From 7329f350eeae1720e4107a76ab196ec9836e88d9 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Fri, 23 Apr 2021 23:48:59 -0400
Subject: [PATCH 24/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 7fe828e..ce7ad88 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -46,21 +46,14 @@ jobs:
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
-<<<<<<< HEAD
           tag1="latest"
           tag2="0.12.8-$(date +%Y%m%d%H%M)"
           echo $tag2
           docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-=======
-          tag="0.12.8-$(date +%Y%m%d%H%M)"
-          tag2="latest"
-          echo $tag
-          create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
->>>>>>> e3a142962b295da93d0eea25665b8baeca87dbee
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
             docker manifest push neethumohan1212:$tag; docker manifest push neethumohan1212:$tag2
           else
             echo "no changes"
-          fi
+          

From 13e4c490c4ebcceabc3f4a94f1827848e1611182 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Sat, 24 Apr 2021 00:13:31 -0400
Subject: [PATCH 25/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index ce7ad88..d843bea 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -56,4 +56,5 @@ jobs:
             docker manifest push neethumohan1212:$tag; docker manifest push neethumohan1212:$tag2
           else
             echo "no changes"
+          fi
           

From b2be3e943bbdaec147175480dac6786bfdc71047 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Sat, 24 Apr 2021 00:47:00 -0400
Subject: [PATCH 26/67] version5

---
 .github/workflows/kolibri.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 7fe828e..355a190 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -38,7 +38,6 @@ jobs:
           echo $kolibri_arm64_sha
           flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
           echo $flag_arm64
-          echo $DOCKERAPIKEY | docker login -u "neethumohan1212" --password-stdin
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
           build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
           build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
@@ -46,21 +45,14 @@ jobs:
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
-<<<<<<< HEAD
           tag1="latest"
-          tag2="0.12.8-$(date +%Y%m%d%H%M)"
+          tag2="$(date +%Y%m%d%H%M)"
           echo $tag2
           docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-=======
-          tag="0.12.8-$(date +%Y%m%d%H%M)"
-          tag2="latest"
-          echo $tag
-          create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
->>>>>>> e3a142962b295da93d0eea25665b8baeca87dbee
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212:$tag; docker manifest push neethumohan1212:$tag2
+            docker manifest push neethumohan1212/kolibri:$tag; docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From effea951c39c83bba925ebf34df1f352ca91cebf Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Sat, 24 Apr 2021 00:50:21 -0400
Subject: [PATCH 27/67] version7

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index e483932..4744217 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -52,7 +52,7 @@ jobs:
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag; docker manifest push neethumohan1212/kolibri:$tag2
+            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From 2b5c4b16d6c264aae71a5eeaf59f89560b33836f Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 19:45:28 -0400
Subject: [PATCH 28/67] test1

---
 .github/workflows/kolibri.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 4744217..46016c7 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,12 +48,12 @@ jobs:
           tag1="latest"
           tag2="$(date +%Y%m%d%H%M)"
           echo $tag2
-          docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest inspect neethumohan1212/kolibri:$tag1
-          docker manifest inspect neethumohan1212/kolibri:$tag2
-          if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
-          else
-            echo "no changes"
-          fi
+          # docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          # docker manifest inspect neethumohan1212/kolibri:$tag1
+          # docker manifest inspect neethumohan1212/kolibri:$tag2
+          # if [[ $flag == true ]]; then
+          #   docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
+          # else
+          #   echo "no changes"
+          # fi
           

From 6ef81660ba8178b4d901fa18d74c3ebea01e1905 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 19:49:07 -0400
Subject: [PATCH 29/67] test2

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 46016c7..13db77f 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,7 +48,7 @@ jobs:
           tag1="latest"
           tag2="$(date +%Y%m%d%H%M)"
           echo $tag2
-          # docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           # docker manifest inspect neethumohan1212/kolibri:$tag1
           # docker manifest inspect neethumohan1212/kolibri:$tag2
           # if [[ $flag == true ]]; then

From 25f74392ee9ae38f229a6b65b2798fe2e6dac186 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 19:52:18 -0400
Subject: [PATCH 30/67] test3

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 13db77f..34785cf 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -49,7 +49,7 @@ jobs:
           tag2="$(date +%Y%m%d%H%M)"
           echo $tag2
           docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          # docker manifest inspect neethumohan1212/kolibri:$tag1
+          docker manifest inspect neethumohan1212/kolibri:$tag1
           # docker manifest inspect neethumohan1212/kolibri:$tag2
           # if [[ $flag == true ]]; then
           #   docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2

From 16de74b14f159afe1b43100bf375bee12d0aa5ec Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 19:59:39 -0400
Subject: [PATCH 31/67] test4

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 34785cf..133558e 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -50,7 +50,7 @@ jobs:
           echo $tag2
           docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           docker manifest inspect neethumohan1212/kolibri:$tag1
-          # docker manifest inspect neethumohan1212/kolibri:$tag2
+          docker manifest inspect neethumohan1212/kolibri:$tag2
           # if [[ $flag == true ]]; then
           #   docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
           # else

From 56419b8358038bca3aac4f121bdd01193023a6ea Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 20:07:17 -0400
Subject: [PATCH 32/67] test5

---
 .github/workflows/kolibri.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 133558e..997fe44 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -45,8 +45,8 @@ jobs:
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
-          tag1="latest"
-          tag2="$(date +%Y%m%d%H%M)"
+          tag1=$(date +%Y%m%d%H%M)
+          tag2="latest"
           echo $tag2
           docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           docker manifest inspect neethumohan1212/kolibri:$tag1

From aaf88a5059189afa4686dcf612ee8c270994fea7 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 20:12:15 -0400
Subject: [PATCH 33/67] test6

---
 .github/workflows/kolibri.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 997fe44..c3c9cf6 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -51,9 +51,9 @@ jobs:
           docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
-          # if [[ $flag == true ]]; then
-          #   docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
-          # else
-          #   echo "no changes"
-          # fi
+          if [[ $flag == true ]]; then
+            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
+          else
+            echo "no changes"
+          fi
           

From 55deef4df65ab5ce8825e0630be0779d1704dfcc Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 20:17:46 -0400
Subject: [PATCH 34/67] test7

---
 .github/workflows/kolibri.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index c3c9cf6..0fa30d7 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -52,7 +52,8 @@ jobs:
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
+            docker manifest push neethumohan1212/kolibri:$tag1
+            #docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From 82596dc407c7d1af0cbbe35c5bc2e83d6b5f614b Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 20:38:09 -0400
Subject: [PATCH 35/67] test8

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 0fa30d7..7bc9b88 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,7 +48,7 @@ jobs:
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest create $repo $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then

From b280cdafdf8904bbddbd671b7bb2d5a329eb97d3 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 20:43:20 -0400
Subject: [PATCH 36/67] test9

---
 .github/workflows/kolibri.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 7bc9b88..03b1f4a 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -22,38 +22,38 @@ jobs:
           source utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
-          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
+          kolibri_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
           echo $kolibri_arm_sha
-          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
+          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "$repo@"$kolibri_arm_sha)
           echo $flag_arm
           alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
           echo $alpine_amd64_sha
-          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
+          kolibri_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
           echo $kolibri_amd64_sha
-          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
+          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "$repo@"$kolibri_amd64_sha)
           echo $flag_amd64
           alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
           echo $alpine_arm64_sha
-          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
+          kolibri_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
           echo $kolibri_arm64_sha
-          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "$repo@"$kolibri_arm64_sha)
           echo $flag_arm64
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
-          build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
-          build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
+          build_image "treehouses/alpine:latest" arm "$repo" $flag_arm
+          build_image "treehouses/alpine:latest" amd64 "$repo" $flag_amd64
+          build_image "treehouses/alpine:latest" arm64 "$repo" $flag_arm64
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          docker manifest create $repo $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest inspect neethumohan1212/kolibri:$tag1
-          docker manifest inspect neethumohan1212/kolibri:$tag2
+          docker manifest create $repo $tag1 $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+          docker manifest inspect $repo:$tag1
+          docker manifest inspect $repo:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag1
-            #docker manifest push neethumohan1212/kolibri:$tag2
+            docker manifest push $repo:$tag1
+            docker manifest push $repo:$tag2
           else
             echo "no changes"
           fi

From 1e11dbd4afba70dc026974299bfa09bdfadfed04 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 20:48:55 -0400
Subject: [PATCH 37/67] test9

---
 .github/workflows/kolibri.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 03b1f4a..fef16bc 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -52,8 +52,7 @@ jobs:
           docker manifest inspect $repo:$tag1
           docker manifest inspect $repo:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push $repo:$tag1
-            docker manifest push $repo:$tag2
+            docker manifest push $repo:$tag1; docker manifest push $repo:$tag2
           else
             echo "no changes"
           fi

From db733a25e5a697a685a2d4f46c33e5dbdb9981d3 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:02:04 -0400
Subject: [PATCH 38/67] test10

---
 .github/workflows/kolibri.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index fef16bc..d7a9491 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,6 +48,7 @@ jobs:
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
+          docker login -u ${{ secrets.DOCKERUSERNAME }} -p ${{ secrets.DOCKERAPIKEY }}
           docker manifest create $repo $tag1 $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
           docker manifest inspect $repo:$tag1
           docker manifest inspect $repo:$tag2
@@ -56,4 +57,4 @@ jobs:
           else
             echo "no changes"
           fi
-          
+

From 7de1879383dc48358b8bee7f8d469215c8d00b58 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:07:59 -0400
Subject: [PATCH 39/67] test1

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index d7a9491..7fdfeea 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -53,7 +53,7 @@ jobs:
           docker manifest inspect $repo:$tag1
           docker manifest inspect $repo:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push $repo:$tag1; docker manifest push $repo:$tag2
+            #docker manifest push $repo:$tag1; docker manifest push $repo:$tag2
           else
             echo "no changes"
           fi

From 2c5879abf8b37625c792feb73cedee85b6a5a169 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:21:31 -0400
Subject: [PATCH 40/67] teat2

---
 .github/workflows/kolibri.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 7fdfeea..37a9339 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -22,38 +22,37 @@ jobs:
           source utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
-          kolibri_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
+          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
           echo $kolibri_arm_sha
-          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "$repo@"$kolibri_arm_sha)
+          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
           echo $flag_arm
           alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
           echo $alpine_amd64_sha
-          kolibri_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
+          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
           echo $kolibri_amd64_sha
-          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "$repo@"$kolibri_amd64_sha)
+          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
           echo $flag_amd64
           alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
           echo $alpine_arm64_sha
-          kolibri_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
+          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
           echo $kolibri_arm64_sha
-          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "$repo@"$kolibri_arm64_sha)
+          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
           echo $flag_arm64
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          build_image "treehouses/alpine:latest" arm "$repo" $flag_arm
-          build_image "treehouses/alpine:latest" amd64 "$repo" $flag_amd64
-          build_image "treehouses/alpine:latest" arm64 "$repo" $flag_arm64
+          build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
+          build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
+          build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          docker login -u ${{ secrets.DOCKERUSERNAME }} -p ${{ secrets.DOCKERAPIKEY }}
-          docker manifest create $repo $tag1 $tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-          docker manifest inspect $repo:$tag1
-          docker manifest inspect $repo:$tag2
+          docker manifest create neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest inspect neethumohan1212/kolibri:$tag1
+          docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
-            #docker manifest push $repo:$tag1; docker manifest push $repo:$tag2
+            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From 76e4d1c1f851336580257b198a674b967d921eec Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:26:44 -0400
Subject: [PATCH 41/67] test3

---
 .github/workflows/kolibri.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 37a9339..671cc31 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -52,7 +52,8 @@ jobs:
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
+            docker manifest push neethumohan1212/kolibri:$tag1
+            docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From 12a67d92804bebf33cb79546abc9c4bb4673bca6 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:31:45 -0400
Subject: [PATCH 42/67] test4

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 671cc31..98ad48e 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -53,7 +53,7 @@ jobs:
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
             docker manifest push neethumohan1212/kolibri:$tag1
-            docker manifest push neethumohan1212/kolibri:$tag2
+            #docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From fc139fc1e7327cfc0bbe0e46bcf7eff3f5732a07 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:39:39 -0400
Subject: [PATCH 43/67] test

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 98ad48e..671cc31 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -53,7 +53,7 @@ jobs:
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
             docker manifest push neethumohan1212/kolibri:$tag1
-            #docker manifest push neethumohan1212/kolibri:$tag2
+            docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From cb2bbc6e5b1152a972c5668048c4c383d45723fe Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:43:50 -0400
Subject: [PATCH 44/67] test

---
 .github/workflows/kolibri.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 671cc31..aedc9ad 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,13 +48,13 @@ jobs:
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          docker manifest create neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest inspect neethumohan1212/kolibri:$tag1
-          docker manifest inspect neethumohan1212/kolibri:$tag2
-          if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag1
-            docker manifest push neethumohan1212/kolibri:$tag2
-          else
-            echo "no changes"
-          fi
+          # docker manifest create neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          # docker manifest inspect neethumohan1212/kolibri:$tag1
+          # docker manifest inspect neethumohan1212/kolibri:$tag2
+          # if [[ $flag == true ]]; then
+          #   docker manifest push neethumohan1212/kolibri:$tag1
+          #   docker manifest push neethumohan1212/kolibri:$tag2
+          # else
+          #   echo "no changes"
+          # fi
 

From 958e58ca724d99710fbbee2b3218d4a1286590f8 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:46:10 -0400
Subject: [PATCH 45/67] test

---
 .github/workflows/kolibri.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index aedc9ad..5014759 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,9 +48,9 @@ jobs:
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          # docker manifest create neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          # docker manifest inspect neethumohan1212/kolibri:$tag1
-          # docker manifest inspect neethumohan1212/kolibri:$tag2
+          docker manifest create neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest inspect neethumohan1212/kolibri:$tag1
+          docker manifest inspect neethumohan1212/kolibri:$tag2
           # if [[ $flag == true ]]; then
           #   docker manifest push neethumohan1212/kolibri:$tag1
           #   docker manifest push neethumohan1212/kolibri:$tag2

From ac7be36240f202e515cbb7708669cdc9e1f2838d Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:49:19 -0400
Subject: [PATCH 46/67] test

---
 .github/workflows/kolibri.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 5014759..99fe24c 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -49,8 +49,8 @@ jobs:
           tag2="latest"
           echo $tag2
           docker manifest create neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest inspect neethumohan1212/kolibri:$tag1
-          docker manifest inspect neethumohan1212/kolibri:$tag2
+          # docker manifest inspect neethumohan1212/kolibri:$tag1
+          # docker manifest inspect neethumohan1212/kolibri:$tag2
           # if [[ $flag == true ]]; then
           #   docker manifest push neethumohan1212/kolibri:$tag1
           #   docker manifest push neethumohan1212/kolibri:$tag2

From 6d35c9147c3fd306bfbd3ef96ea9792d1a47d2a7 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 21:56:43 -0400
Subject: [PATCH 47/67] test

---
 .github/workflows/kolibri.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 99fe24c..b85647d 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,7 +48,8 @@ jobs:
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          docker manifest create neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest create neethumohan1212/kolibri:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest create neethumohan1212/kolibri:$tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           # docker manifest inspect neethumohan1212/kolibri:$tag1
           # docker manifest inspect neethumohan1212/kolibri:$tag2
           # if [[ $flag == true ]]; then

From 3b058509e150e95f8f835c5a009c1318509a02df Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 22:15:34 -0400
Subject: [PATCH 48/67] final test

---
 .github/workflows/kolibri.yml | 46 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index b85647d..9056f36 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -18,44 +18,44 @@ jobs:
       - name: neethumohan1212 kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
-          repo="neethumohan1212/kolibri"
+          repo="neethumohan1212 kolibri"
           source utils.sh
-          alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
+          alpine_arm_sha=$(get_manifest_sha "neethumohan1212/alpine:latest" "arm")
           echo $alpine_arm_sha
-          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
+          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212 kolibri:latest" "arm")
           echo $kolibri_arm_sha
-          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
+          flag_arm=$(is_base "neethumohan1212/alpine@"$alpine_arm_sha "neethumohan1212 kolibri@"$kolibri_arm_sha)
           echo $flag_arm
-          alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
+          alpine_amd64_sha=$(get_manifest_sha "neethumohan1212/alpine:latest" "amd64")
           echo $alpine_amd64_sha
-          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
+          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212 kolibri:latest" "amd64")
           echo $kolibri_amd64_sha
-          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
+          flag_amd64=$(is_base "neethumohan1212/alpine@"$alpine_amd64_sha "neethumohan1212 kolibri@"$kolibri_amd64_sha)
           echo $flag_amd64
-          alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
+          alpine_arm64_sha=$(get_manifest_sha "neethumohan1212/alpine:latest" "arm64")
           echo $alpine_arm64_sha
-          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
+          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212 kolibri:latest" "arm64")
           echo $kolibri_arm64_sha
-          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+          flag_arm64=$(is_base "neethumohan1212/alpine@"$alpine_arm64_sha "neethumohan1212 kolibri@"$kolibri_arm64_sha)
           echo $flag_arm64
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
-          build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
-          build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
+          build_image "neethumohan1212/alpine:latest" arm "neethumohan1212 kolibri" $flag_arm
+          build_image "neethumohan1212/alpine:latest" amd64 "neethumohan1212 kolibri" $flag_amd64
+          build_image "neethumohan1212/alpine:latest" arm64 "neethumohan1212 kolibri" $flag_arm64
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          docker manifest create neethumohan1212/kolibri:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest create neethumohan1212/kolibri:$tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          # docker manifest inspect neethumohan1212/kolibri:$tag1
-          # docker manifest inspect neethumohan1212/kolibri:$tag2
-          # if [[ $flag == true ]]; then
-          #   docker manifest push neethumohan1212/kolibri:$tag1
-          #   docker manifest push neethumohan1212/kolibri:$tag2
-          # else
-          #   echo "no changes"
-          # fi
+          docker manifest create neethumohan1212 kolibri:$tag1 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
+          docker manifest create neethumohan1212 kolibri:$tag2 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
+          docker manifest inspect neethumohan1212 kolibri:$tag1
+          docker manifest inspect neethumohan1212 kolibri:$tag2
+          if [[ $flag == true ]]; then
+            docker manifest push neethumohan1212 kolibri:$tag1
+            docker manifest push neethumohan1212 kolibri:$tag2
+          else
+            echo "no changes"
+          fi
 

From 0b25e05a047b73a75e7fb67ef09cad915a0d9af9 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 22:22:07 -0400
Subject: [PATCH 49/67] final test

---
 .github/workflows/kolibri.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 9056f36..e01971a 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -39,9 +39,9 @@ jobs:
           flag_arm64=$(is_base "neethumohan1212/alpine@"$alpine_arm64_sha "neethumohan1212 kolibri@"$kolibri_arm64_sha)
           echo $flag_arm64
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          build_image "neethumohan1212/alpine:latest" arm "neethumohan1212 kolibri" $flag_arm
-          build_image "neethumohan1212/alpine:latest" amd64 "neethumohan1212 kolibri" $flag_amd64
-          build_image "neethumohan1212/alpine:latest" arm64 "neethumohan1212 kolibri" $flag_arm64
+          build_image "neethumohan1212/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
+          build_image "neethumohan1212/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
+          build_image "neethumohan1212/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag

From bed12ccc213617ac7037cd74bc610366efd5f9ad Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 22:48:45 -0400
Subject: [PATCH 50/67] final test

---
 .github/workflows/kolibri.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index e01971a..92d4de9 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -49,13 +49,13 @@ jobs:
           tag2="latest"
           echo $tag2
           docker manifest create neethumohan1212 kolibri:$tag1 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
-          docker manifest create neethumohan1212 kolibri:$tag2 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
-          docker manifest inspect neethumohan1212 kolibri:$tag1
-          docker manifest inspect neethumohan1212 kolibri:$tag2
-          if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212 kolibri:$tag1
-            docker manifest push neethumohan1212 kolibri:$tag2
-          else
-            echo "no changes"
-          fi
+          # docker manifest create neethumohan1212 kolibri:$tag2 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
+          # docker manifest inspect neethumohan1212 kolibri:$tag1
+          # docker manifest inspect neethumohan1212 kolibri:$tag2
+          # if [[ $flag == true ]]; then
+          #   docker manifest push neethumohan1212 kolibri:$tag1
+          #   docker manifest push neethumohan1212 kolibri:$tag2
+          # else
+          #   echo "no changes"
+          # fi
 

From e2f53818fc0983baf75815de51600dc067c36629 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 22:53:31 -0400
Subject: [PATCH 51/67] final test

---
 .github/workflows/kolibri.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 92d4de9..1560d3d 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -48,8 +48,8 @@ jobs:
           tag1=$(date +%Y%m%d%H%M)
           tag2="latest"
           echo $tag2
-          docker manifest create neethumohan1212 kolibri:$tag1 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
-          # docker manifest create neethumohan1212 kolibri:$tag2 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
+          docker manifest create neethumohan1212/kolibri:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          # docker manifest create neethumohan1212/kolibri:$tag2 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
           # docker manifest inspect neethumohan1212 kolibri:$tag1
           # docker manifest inspect neethumohan1212 kolibri:$tag2
           # if [[ $flag == true ]]; then

From e37626bd4063e240df7716c558133d47b7c06127 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 22:56:52 -0400
Subject: [PATCH 52/67] final test

---
 .github/workflows/kolibri.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 1560d3d..06e1aa0 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -49,13 +49,13 @@ jobs:
           tag2="latest"
           echo $tag2
           docker manifest create neethumohan1212/kolibri:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          # docker manifest create neethumohan1212/kolibri:$tag2 neethumohan1212 kolibri-tags:amd64 neethumohan1212 kolibri-tags:arm neethumohan1212 kolibri-tags:arm64
-          # docker manifest inspect neethumohan1212 kolibri:$tag1
-          # docker manifest inspect neethumohan1212 kolibri:$tag2
-          # if [[ $flag == true ]]; then
-          #   docker manifest push neethumohan1212 kolibri:$tag1
-          #   docker manifest push neethumohan1212 kolibri:$tag2
-          # else
-          #   echo "no changes"
-          # fi
+          docker manifest create neethumohan1212/kolibri:$tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest inspect neethumohan1212/kolibri:$tag1
+          docker manifest inspect neethumohan1212/kolibri:$tag2
+          if [[ $flag == true ]]; then
+            docker manifest push neethumohan1212/kolibri:$tag1
+            docker manifest push neethumohan1212/kolibri:$tag2
+          else
+            echo "no changes"
+          fi
 

From c1abe8d3cdc73123d9a0a028f9007f4ebea5fb23 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Fri, 30 Apr 2021 23:24:28 -0400
Subject: [PATCH 53/67] final test

---
 .github/workflows/kolibri.yml | 37 +++++++++++++++++------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 06e1aa0..af19a6c 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -18,43 +18,42 @@ jobs:
       - name: neethumohan1212 kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
-          repo="neethumohan1212 kolibri"
+          repo="neethumohan1212/kolibri"
           source utils.sh
-          alpine_arm_sha=$(get_manifest_sha "neethumohan1212/alpine:latest" "arm")
+          alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
-          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212 kolibri:latest" "arm")
+          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
           echo $kolibri_arm_sha
-          flag_arm=$(is_base "neethumohan1212/alpine@"$alpine_arm_sha "neethumohan1212 kolibri@"$kolibri_arm_sha)
+          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
           echo $flag_arm
-          alpine_amd64_sha=$(get_manifest_sha "neethumohan1212/alpine:latest" "amd64")
+          alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
           echo $alpine_amd64_sha
-          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212 kolibri:latest" "amd64")
+          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
           echo $kolibri_amd64_sha
-          flag_amd64=$(is_base "neethumohan1212/alpine@"$alpine_amd64_sha "neethumohan1212 kolibri@"$kolibri_amd64_sha)
+          flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
           echo $flag_amd64
-          alpine_arm64_sha=$(get_manifest_sha "neethumohan1212/alpine:latest" "arm64")
+          alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
           echo $alpine_arm64_sha
-          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212 kolibri:latest" "arm64")
+          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
           echo $kolibri_arm64_sha
-          flag_arm64=$(is_base "neethumohan1212/alpine@"$alpine_arm64_sha "neethumohan1212 kolibri@"$kolibri_arm64_sha)
+          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
           echo $flag_arm64
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          build_image "neethumohan1212/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
-          build_image "neethumohan1212/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
-          build_image "neethumohan1212/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
+          build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
+          build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
+          build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           flag="true"
           echo $flag
-          tag1=$(date +%Y%m%d%H%M)
-          tag2="latest"
+          tag1="latest"
+          tag2="$(date +%Y%m%d%H%M)"
           echo $tag2
-          docker manifest create neethumohan1212/kolibri:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest create neethumohan1212/kolibri:$tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
+          docker manifest create $repo:$tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
           docker manifest inspect neethumohan1212/kolibri:$tag1
           docker manifest inspect neethumohan1212/kolibri:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag1
-            docker manifest push neethumohan1212/kolibri:$tag2
+            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
           else
             echo "no changes"
           fi

From 4b8d201bef9c4a8c73894ea8877abe3c1f2db457 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Sat, 1 May 2021 00:20:02 -0400
Subject: [PATCH 54/67] changes updated

---
 .github/workflows/kolibri.yml | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index af19a6c..e019ebf 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -9,51 +9,50 @@ on:
 jobs:
   build:
     runs-on: ubuntu-20.04
-
     steps:
       - name: checkout code
         uses: actions/checkout@v2
       - name: docker login
         run: docker login -u ${{ secrets.DOCKERUSERNAME }} -p ${{ secrets.DOCKERAPIKEY }}
-      - name: neethumohan1212 kolibri
+      - name: treehouses kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
-          repo="neethumohan1212/kolibri"
+          repo="treehouses/kolibri"
           source utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
-          kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
+          kolibri_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
           echo $kolibri_arm_sha
-          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
+          flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "$repo@"$kolibri_arm_sha)
           echo $flag_arm
           alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
           echo $alpine_amd64_sha
-          kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
+          kolibri_amd64_sha=$(get_manifest_sha "$repo:latest" "amd64")
           echo $kolibri_amd64_sha
           flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
           echo $flag_amd64
           alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
           echo $alpine_arm64_sha
-          kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
+          kolibri_arm64_sha=$(get_manifest_sha "$repo:latest" "arm64")
           echo $kolibri_arm64_sha
-          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+          flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "$repo@"$kolibri_arm64_sha)
           echo $flag_arm64
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
-          build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
-          build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
+          build_image "treehouses/alpine:latest" arm "$repo" $flag_arm
+          build_image "treehouses/alpine:latest" amd64 "$repo" $flag_amd64
+          build_image "treehouses/alpine:latest" arm64 "$repo" $flag_arm64
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
-          flag="true"
+          #flag="true"
           echo $flag
           tag1="latest"
           tag2="$(date +%Y%m%d%H%M)"
           echo $tag2
-          docker manifest create $repo:$tag1 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest create $repo:$tag2 neethumohan1212/kolibri-tags:amd64 neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-          docker manifest inspect neethumohan1212/kolibri:$tag1
-          docker manifest inspect neethumohan1212/kolibri:$tag2
+          docker manifest create $repo:$tag1 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+          docker manifest create $repo:$tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+          docker manifest inspect $repo:$tag1
+          docker manifest inspect $repo:$tag2
           if [[ $flag == true ]]; then
-            docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push neethumohan1212/kolibri:$tag2
+            docker manifest push $repo:$tag1; docker manifest push $repo:$tag2
           else
             echo "no changes"
           fi

From 81019f3055864f3254fd45148ebab323f79c5c01 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Sat, 1 May 2021 00:34:26 -0400
Subject: [PATCH 55/67] Update .travis.yml

---
 .travis.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b4d4512..601d5c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,45 +11,45 @@ script:
 - source utils.sh
 - alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
 - echo $alpine_arm_sha
-- kolibri_arm_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm")
+- kolibri_arm_sha=$(get_manifest_sha "treehouses/kolibri:latest" "arm")
 - echo $kolibri_arm_sha
-- flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "neethumohan1212/kolibri@"$kolibri_arm_sha)
+- flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "treehouses/kolibri@"$kolibri_arm_sha)
 - echo $flag_arm
 - alpine_amd64_sha=$(get_manifest_sha "treehouses/alpine:latest" "amd64")
 - echo $alpine_amd64_sha
-- kolibri_amd64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "amd64")
+- kolibri_amd64_sha=$(get_manifest_sha "treehouses/kolibri:latest" "amd64")
 - echo $kolibri_amd64_sha
-- flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "neethumohan1212/kolibri@"$kolibri_amd64_sha)
+- flag_amd64=$(is_base "treehouses/alpine@"$alpine_amd64_sha "treehouses/kolibri@"$kolibri_amd64_sha)
 - echo $flag_amd64
 - alpine_arm64_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm64")
 - echo $alpine_arm64_sha
-- kolibri_arm64_sha=$(get_manifest_sha "neethumohan1212/kolibri:latest" "arm64")
+- kolibri_arm64_sha=$(get_manifest_sha "treehouses/kolibri:latest" "arm64")
 - echo $kolibri_arm64_sha
-- flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "neethumohan1212/kolibri@"$kolibri_arm64_sha)
+- flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "treehouses/kolibri@"$kolibri_arm64_sha)
 - echo $flag_arm64
-- echo $DOCKERAPIKEY | docker login -u "neethumohan1212" --password-stdin
+- echo $DOCKERAPIKEY | docker login -u "treehouses" --password-stdin
 - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-- build_image "treehouses/alpine:latest" arm "neethumohan1212/kolibri" $flag_arm
-- build_image "treehouses/alpine:latest" amd64 "neethumohan1212/kolibri" $flag_amd64
-- build_image "treehouses/alpine:latest" arm64 "neethumohan1212/kolibri" $flag_arm64
+- build_image "treehouses/alpine:latest" arm "treehouses/kolibri" $flag_arm
+- build_image "treehouses/alpine:latest" amd64 "treehouses/kolibri" $flag_amd64
+- build_image "treehouses/alpine:latest" arm64 "treehouses/kolibri" $flag_arm64
 - flag=$(change $flag_arm $flag_arm64 $flag_amd64)
 - flag="true"
 - echo $flag
 before_deploy:
-- deploy_image "neethumohan1212/kolibri" arm
-- deploy_image "neethumohan1212/kolibri" amd64
-- deploy_image "neethumohan1212/kolibri" arm64
+- deploy_image "treehouses/kolibri" arm
+- deploy_image "treehouses/kolibri" amd64
+- deploy_image "treehouses/kolibri" arm64
 - tag1="latest"
 - tag2=$(date +%Y%m%d%H%M)
 - echo $tag2
-- create_manifest neethumohan1212/kolibri $tag1 $tag2 neethumohan1212/kolibri-tags:amd64
-  neethumohan1212/kolibri-tags:arm neethumohan1212/kolibri-tags:arm64
-- docker manifest inspect neethumohan1212/kolibri:$tag1
-- docker manifest inspect neethumohan1212/kolibri:$tag2
+- create_manifest treehouses/kolibri $tag1 $tag2 treehouses/kolibri-tags:amd64
+  treehouses/kolibri-tags:arm treehouses/kolibri-tags:arm64
+- docker manifest inspect treehouses/kolibri:$tag1
+- docker manifest inspect treehouses/kolibri:$tag2
 deploy:
 - provider: script
-  script: docker manifest push neethumohan1212/kolibri:$tag1; docker manifest push
-    neethumohan1212/kolibri:$tag2
+  script: docker manifest push treehouses/kolibri:$tag1; docker manifest push
+    treehouses/kolibri:$tag2
   skip_cleanup: true
   on:
     all_branches: true

From f227e8f860e35748f1ba16ed16ca1a43191a3e15 Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Sat, 1 May 2021 00:43:15 -0400
Subject: [PATCH 56/67] Rename .travis.yml to .travis.yml.old

---
 .travis.yml => .travis.yml.old | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .travis.yml => .travis.yml.old (100%)

diff --git a/.travis.yml b/.travis.yml.old
similarity index 100%
rename from .travis.yml
rename to .travis.yml.old

From 1e1fedd206af6a93b93ac153bd675df92ebc360e Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Sat, 1 May 2021 00:44:50 -0400
Subject: [PATCH 57/67] Rename utils.sh to .github/workflow/utils.sh

---
 utils.sh => .github/workflow/utils.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename utils.sh => .github/workflow/utils.sh (99%)

diff --git a/utils.sh b/.github/workflow/utils.sh
similarity index 99%
rename from utils.sh
rename to .github/workflow/utils.sh
index e1b54f5..42b71a1 100644
--- a/utils.sh
+++ b/.github/workflow/utils.sh
@@ -113,4 +113,4 @@ deploy_image(){
   docker push $tag_arch_time
   docker tag $tag_arch_time $tag_arch
   docker push $tag_arch
-}
\ No newline at end of file
+}

From fdcc18b38c52ef5e51840c00de6db643e8ee2631 Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Sat, 1 May 2021 00:45:35 -0400
Subject: [PATCH 58/67] Rename .github/workflow/utils.sh to
 .github/workflows/utils.sh

---
 .github/{workflow => workflows}/utils.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/{workflow => workflows}/utils.sh (100%)

diff --git a/.github/workflow/utils.sh b/.github/workflows/utils.sh
similarity index 100%
rename from .github/workflow/utils.sh
rename to .github/workflows/utils.sh

From 58b5b5c20e0cc87da6dbdc6c3e8d77d0e8527d42 Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Sat, 1 May 2021 00:46:15 -0400
Subject: [PATCH 59/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index e019ebf..f512cb1 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -18,7 +18,7 @@ jobs:
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
           repo="treehouses/kolibri"
-          source utils.sh
+          source .github/workflows/utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
           kolibri_arm_sha=$(get_manifest_sha "$repo:latest" "arm")

From a63e86b6cdc56313c21e1d9877d6a1196d2dba95 Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Sat, 1 May 2021 00:48:12 -0400
Subject: [PATCH 60/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index f512cb1..a1fb772 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -7,7 +7,7 @@ on:
     types: kolibri
 
 jobs:
-  build:
+  kolibri:
     runs-on: ubuntu-20.04
     steps:
       - name: checkout code

From 87c6aba6daf7468919711502bd06674d6515d861 Mon Sep 17 00:00:00 2001
From: dogi <dogi@users.noreply.github.com>
Date: Sat, 1 May 2021 00:51:18 -0400
Subject: [PATCH 61/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index a1fb772..c3dcf2c 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -37,21 +37,21 @@ jobs:
           echo $kolibri_arm64_sha
           flag_arm64=$(is_base "treehouses/alpine@"$alpine_arm64_sha "$repo@"$kolibri_arm64_sha)
           echo $flag_arm64
-          docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          build_image "treehouses/alpine:latest" arm "$repo" $flag_arm
-          build_image "treehouses/alpine:latest" amd64 "$repo" $flag_amd64
-          build_image "treehouses/alpine:latest" arm64 "$repo" $flag_arm64
           flag=$(change $flag_arm $flag_arm64 $flag_amd64)
           #flag="true"
           echo $flag
-          tag1="latest"
-          tag2="$(date +%Y%m%d%H%M)"
-          echo $tag2
-          docker manifest create $repo:$tag1 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-          docker manifest create $repo:$tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
-          docker manifest inspect $repo:$tag1
-          docker manifest inspect $repo:$tag2
           if [[ $flag == true ]]; then
+            docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+            build_image "treehouses/alpine:latest" arm "$repo" $flag_arm
+            build_image "treehouses/alpine:latest" amd64 "$repo" $flag_amd64
+            build_image "treehouses/alpine:latest" arm64 "$repo" $flag_arm64
+            tag1="latest"
+            tag2="$(date +%Y%m%d%H%M)"
+            echo $tag2
+            docker manifest create $repo:$tag1 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            docker manifest create $repo:$tag2 $repo-tags:amd64 $repo-tags:arm $repo-tags:arm64
+            docker manifest inspect $repo:$tag1
+            docker manifest inspect $repo:$tag2
             docker manifest push $repo:$tag1; docker manifest push $repo:$tag2
           else
             echo "no changes"

From 581468c7458311b74602387aea16a91e7d8a4b99 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Sat, 1 May 2021 00:54:08 -0400
Subject: [PATCH 62/67] changes

---
 .github/workflows/kolibri.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index e019ebf..9221936 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -14,10 +14,10 @@ jobs:
         uses: actions/checkout@v2
       - name: docker login
         run: docker login -u ${{ secrets.DOCKERUSERNAME }} -p ${{ secrets.DOCKERAPIKEY }}
-      - name: treehouses kolibri
+      - name: neethumohan1212 kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
-          repo="treehouses/kolibri"
+          repo="neethumohan1212/kolibri"
           source utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha

From 17cf43c073bd9a389b938576d0da2279eb4989d7 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Sat, 1 May 2021 00:57:51 -0400
Subject: [PATCH 63/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index bdd7469..5ecefdb 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -17,13 +17,8 @@ jobs:
       - name: neethumohan1212 kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
-<<<<<<< HEAD
           repo="neethumohan1212/kolibri"
           source utils.sh
-=======
-          repo="treehouses/kolibri"
-          source .github/workflows/utils.sh
->>>>>>> 87c6aba6daf7468919711502bd06674d6515d861
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
           kolibri_arm_sha=$(get_manifest_sha "$repo:latest" "arm")

From c29149cb6b6fd77562b26aa85a784153be696866 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Sat, 1 May 2021 00:59:52 -0400
Subject: [PATCH 64/67] updated

---
 .github/workflows/kolibri.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index bdd7469..442da19 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -17,13 +17,8 @@ jobs:
       - name: neethumohan1212 kolibri
         run: |
           export DOCKER_CLI_EXPERIMENTAL=enabled
-<<<<<<< HEAD
           repo="neethumohan1212/kolibri"
-          source utils.sh
-=======
-          repo="treehouses/kolibri"
           source .github/workflows/utils.sh
->>>>>>> 87c6aba6daf7468919711502bd06674d6515d861
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
           kolibri_arm_sha=$(get_manifest_sha "$repo:latest" "arm")

From 54149af2ccc83878688af17602c9708ddf588a16 Mon Sep 17 00:00:00 2001
From: Neethu <Mohan>
Date: Sat, 1 May 2021 01:37:11 -0400
Subject: [PATCH 65/67] updated

---
 .github/workflows/kolibri.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 442da19..57f1719 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -21,7 +21,7 @@ jobs:
           source .github/workflows/utils.sh
           alpine_arm_sha=$(get_manifest_sha "treehouses/alpine:latest" "arm")
           echo $alpine_arm_sha
-          kolibri_arm_sha=$(get_manifest_sha "$repo:latest" "arm")
+          kolibri_arm_sha=$(get_manifest_sha $repo:latest arm)
           echo $kolibri_arm_sha
           flag_arm=$(is_base "treehouses/alpine@"$alpine_arm_sha "$repo@"$kolibri_arm_sha)
           echo $flag_arm

From a15a368d805fc91dd2a4289361a283adae60c7df Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Wed, 19 May 2021 21:34:52 -0400
Subject: [PATCH 66/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 57f1719..8529942 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -2,7 +2,6 @@ name: kolibri-docker-image-build
 
 on:
   push:
-  workflow_dispatch:
   repository_dispatch:
     types: kolibri
 

From 33455e94639e1d94850c34b93b0345a95745ee74 Mon Sep 17 00:00:00 2001
From: Neethu-Mohan <neethumohan1212@gmail.com>
Date: Wed, 19 May 2021 21:44:09 -0400
Subject: [PATCH 67/67] Update kolibri.yml

---
 .github/workflows/kolibri.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/kolibri.yml b/.github/workflows/kolibri.yml
index 8529942..57f1719 100644
--- a/.github/workflows/kolibri.yml
+++ b/.github/workflows/kolibri.yml
@@ -2,6 +2,7 @@ name: kolibri-docker-image-build
 
 on:
   push:
+  workflow_dispatch:
   repository_dispatch:
     types: kolibri