From c308df1699390d013e78bc0ccfd66a804409ca97 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 10:17:17 -0400
Subject: [PATCH 01/23] add multiple architecture Dockerfiles

---
 image/Dockerfile.amd64               | 12 ++++++++++++
 image/Dockerfile.arm64               | 12 ++++++++++++
 image/Dockerfile.armv7               | 12 ++++++++++++
 image/{Dockerfile => Dockerfile.old} |  0
 4 files changed, 36 insertions(+)
 create mode 100644 image/Dockerfile.amd64
 create mode 100644 image/Dockerfile.arm64
 create mode 100644 image/Dockerfile.armv7
 rename image/{Dockerfile => Dockerfile.old} (100%)

diff --git a/image/Dockerfile.amd64 b/image/Dockerfile.amd64
new file mode 100644
index 00000000..606e2fdd
--- /dev/null
+++ b/image/Dockerfile.amd64
@@ -0,0 +1,12 @@
+FROM debian:stretch-slim
+
+#COPY qemu-x86_64-static /usr/bin
+
+COPY . /container
+RUN /container/build.sh
+
+ENV LANG="en_US.UTF-8" \
+    LANGUAGE="en_US:en" \
+    LC_ALL="en_US.UTF-8"
+
+ENTRYPOINT ["/container/tool/run"]
diff --git a/image/Dockerfile.arm64 b/image/Dockerfile.arm64
new file mode 100644
index 00000000..8596127b
--- /dev/null
+++ b/image/Dockerfile.arm64
@@ -0,0 +1,12 @@
+FROM arm64v8/debian:stretch-slim
+
+COPY qemu-aarch64-static /usr/bin
+
+COPY . /container
+RUN /container/build.sh
+
+ENV LANG="en_US.UTF-8" \
+    LANGUAGE="en_US:en" \
+    LC_ALL="en_US.UTF-8"
+
+ENTRYPOINT ["/container/tool/run"]
diff --git a/image/Dockerfile.armv7 b/image/Dockerfile.armv7
new file mode 100644
index 00000000..a6cabe4a
--- /dev/null
+++ b/image/Dockerfile.armv7
@@ -0,0 +1,12 @@
+FROM arm32v7/debian:stretch-slim
+
+COPY qemu-arm-static /usr/bin
+
+COPY . /container
+RUN /container/build.sh
+
+ENV LANG="en_US.UTF-8" \
+    LANGUAGE="en_US:en" \
+    LC_ALL="en_US.UTF-8"
+
+ENTRYPOINT ["/container/tool/run"]
diff --git a/image/Dockerfile b/image/Dockerfile.old
similarity index 100%
rename from image/Dockerfile
rename to image/Dockerfile.old

From c9e72ce6f923c23459840e44ed393d41437269de Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 10:17:50 -0400
Subject: [PATCH 02/23] updatd makefile for multiple architectures

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a4f2321f..34a7c173 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
-NAME = osixia/light-baseimage
+NAME = ndanyluk/light-baseimage
 VERSION = 1.1.2
+ARCH = amd64
 
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
 build:
-	docker build -t $(NAME):$(VERSION) --rm image
+	docker build -f Dockerfile.$(ARCH) -t $(NAME):$(VERSION) --rm image
 
 build-nocache:
 	docker build -t $(NAME):$(VERSION) --no-cache --rm image

From 613f07230e16e875a190b659923b1b9b4a529ba7 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 10:48:48 -0400
Subject: [PATCH 03/23] add travis ci support for builds

---
 .travis.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..e2993464
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,45 @@
+sudo: required
+
+language: generic
+
+services:
+  - docker
+
+env:
+  global:
+    - qemu_version=4.0.0
+  matrix:
+    - target_arch=amd64 qemu_arch=x86_64
+    - target_arch=armv7 qemu_arch=arm
+#    - target_arch=armv6 qemu_arch=arm
+    - target_arch=arm64 qemu_arch=aarch64
+
+before_install:
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y install docker-ce
+  - mkdir $HOME/.docker
+  - 'echo "{" > $HOME/.docker/config.json'
+  - 'echo "  \"experimental\": \"enabled\"" >> $HOME/.docker/config.json'
+  - 'echo "}" >> $HOME/.docker/config.json'
+  - sudo service docker restart
+
+install:
+  - docker run --rm --privileged multiarch/qemu-user-static:register
+  - curl -sLO https://github.com/multiarch/qemu-user-static/releases/download/v${qemu_version}/qemu-${qemu_arch}-static.tar.gz;
+  - tar -xzvf qemu-${qemu_arch}-static.tar.gz;
+  - make build ARCH=${target_arch}
+
+script:
+  - make test
+
+after_success:
+  - if [ -z "$DOCKER_USER" ]; then
+      echo "PR build, skipping Docker Hub push";
+    elif [ "$TRAVIS_BRANCH" != "master" ]; then
+      echo "Branch build, skipping Docker Hub push";
+    else
+      docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+      make tag-latest push push-latest
+    fi

From 859fd936acacca3a49d4430b492becdcd98a1bfe Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 10:54:41 -0400
Subject: [PATCH 04/23] add bats to travis config

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

diff --git a/.travis.yml b/.travis.yml
index e2993464..a581319d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,9 @@ before_install:
   - 'echo "  \"experimental\": \"enabled\"" >> $HOME/.docker/config.json'
   - 'echo "}" >> $HOME/.docker/config.json'
   - sudo service docker restart
+  - git clone https://github.com/sstephenson/bats.git
+  - cd bats
+  - sudo ./install.sh
 
 install:
   - docker run --rm --privileged multiarch/qemu-user-static:register

From c4f2a2dee056f664b45eedd3617e3695e7ba412d Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 11:04:10 -0400
Subject: [PATCH 05/23] addee architecture to image name

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 34a7c173..cbc506d5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ ARCH = amd64
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
 build:
-	docker build -f Dockerfile.$(ARCH) -t $(NAME):$(VERSION) --rm image
+	docker build -f Dockerfile.$(ARCH) -t $(NAME)-$(ARCH):$(VERSION) --rm image
 
 build-nocache:
-	docker build -t $(NAME):$(VERSION) --no-cache --rm image
+	docker build -f Dockerfile.$(ARCH) -t $(NAME)-$(ARCH):$(VERSION) --no-cache --rm image
 
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats

From 026e5eaa67a329e771542c90da75e977bc7c255b Mon Sep 17 00:00:00 2001
From: ndanyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 11:21:07 -0400
Subject: [PATCH 06/23] Update tags and tests to handle different arches

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cbc506d5..7ee8c212 100644
--- a/Makefile
+++ b/Makefile
@@ -11,16 +11,16 @@ build-nocache:
 	docker build -f Dockerfile.$(ARCH) -t $(NAME)-$(ARCH):$(VERSION) --no-cache --rm image
 
 test:
-	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats
+	env NAME=$(NAME)-$(ARCH) VERSION=$(VERSION) bats test/test.bats
 
 tag-latest:
-	docker tag $(NAME):$(VERSION) $(NAME):latest
+	docker tag $(NAME)-$(ARCH):$(VERSION) $(NAME)-$(ARCH):latest
 
 push:
-	docker push $(NAME):$(VERSION)
+	docker push $(NAME)-$(ARCH):$(VERSION)
 
 push-latest:
-	docker push $(NAME):latest
+	docker push $(NAME)-$(ARCH):latest
 
 release: build test tag-latest push push-latest
 

From 3d67723c1ac272f8cfc7ed9f528d4d1bc2dcf2f8 Mon Sep 17 00:00:00 2001
From: ndanyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 11:22:31 -0400
Subject: [PATCH 07/23] Add proper install directory for BATS and comments

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a581319d..cf2a7519 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
   matrix:
     - target_arch=amd64 qemu_arch=x86_64
     - target_arch=armv7 qemu_arch=arm
-#    - target_arch=armv6 qemu_arch=arm
+#    - target_arch=armv6 qemu_arch=arm <------ NOT SUPPORTED BY DEBIAN STRETCH BASE IMAGE
     - target_arch=arm64 qemu_arch=aarch64
 
 before_install:
@@ -26,7 +26,7 @@ before_install:
   - sudo service docker restart
   - git clone https://github.com/sstephenson/bats.git
   - cd bats
-  - sudo ./install.sh
+  - sudo ./install.sh /usr/local
 
 install:
   - docker run --rm --privileged multiarch/qemu-user-static:register

From 80f92bdfb35df869d8c4f9ef03172b9ec701bbff Mon Sep 17 00:00:00 2001
From: ndanyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 12:14:55 -0400
Subject: [PATCH 08/23] Fix make command

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

diff --git a/.travis.yml b/.travis.yml
index cf2a7519..ed00e979 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ install:
   - docker run --rm --privileged multiarch/qemu-user-static:register
   - curl -sLO https://github.com/multiarch/qemu-user-static/releases/download/v${qemu_version}/qemu-${qemu_arch}-static.tar.gz;
   - tar -xzvf qemu-${qemu_arch}-static.tar.gz;
-  - make build ARCH=${target_arch}
+  - make build ARCH="${target_arch}"
 
 script:
   - make test

From ca91402b117bac43ea49134f971a3ca0d03cb412 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 12:41:21 -0400
Subject: [PATCH 09/23] correct dockerfile symlink in make

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index cbc506d5..6e7c9c74 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,10 @@ ARCH = amd64
 .PHONY: build build-nocache test tag-latest push push-latest release git-tag-version
 
 build:
-	docker build -f Dockerfile.$(ARCH) -t $(NAME)-$(ARCH):$(VERSION) --rm image
+	docker build -f image/Dockerfile.$(ARCH) -t $(NAME)-$(ARCH):$(VERSION) --rm image
 
 build-nocache:
-	docker build -f Dockerfile.$(ARCH) -t $(NAME)-$(ARCH):$(VERSION) --no-cache --rm image
+	docker build -f image/Dockerfile.$(ARCH) -t $(NAME)-$(ARCH):$(VERSION) --no-cache --rm image
 
 test:
 	env NAME=$(NAME) VERSION=$(VERSION) bats test/test.bats

From 9a76da5ac999b882a683df6edd3185e4426dccd9 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 12:50:11 -0400
Subject: [PATCH 10/23] correct arch argument to travis-ci

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

diff --git a/.travis.yml b/.travis.yml
index ed00e979..cf2a7519 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ install:
   - docker run --rm --privileged multiarch/qemu-user-static:register
   - curl -sLO https://github.com/multiarch/qemu-user-static/releases/download/v${qemu_version}/qemu-${qemu_arch}-static.tar.gz;
   - tar -xzvf qemu-${qemu_arch}-static.tar.gz;
-  - make build ARCH="${target_arch}"
+  - make build ARCH=${target_arch}
 
 script:
   - make test

From 9b08e4bc2b003495a2e94517d7c33ca4254c6894 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 13:52:56 -0400
Subject: [PATCH 11/23] fixed build directory

---
 .Makefile.swp | Bin 0 -> 1024 bytes
 .travis.yml   |   1 +
 2 files changed, 1 insertion(+)
 create mode 100644 .Makefile.swp

diff --git a/.Makefile.swp b/.Makefile.swp
new file mode 100644
index 0000000000000000000000000000000000000000..abd6a20e6213f071aa82db9fcb3044300ca88541
GIT binary patch
literal 1024
zcmYc?$V<%2S1{5u*E3;20z!fe3<a4;0(h7OnYuZti7BZ?c+`NTd=s-%(=u~X2`C$t
N9u0xf5TH{C000)93grL*

literal 0
HcmV?d00001

diff --git a/.travis.yml b/.travis.yml
index cf2a7519..a4d4560a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,6 +27,7 @@ before_install:
   - git clone https://github.com/sstephenson/bats.git
   - cd bats
   - sudo ./install.sh /usr/local
+  - cd ..
 
 install:
   - docker run --rm --privileged multiarch/qemu-user-static:register

From 30fc6950ae174f83dcc990aeab53158189b3138d Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 13:56:38 -0400
Subject: [PATCH 12/23] move qemu to correct build directory

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

diff --git a/.travis.yml b/.travis.yml
index a4d4560a..ff60b1b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ install:
   - docker run --rm --privileged multiarch/qemu-user-static:register
   - curl -sLO https://github.com/multiarch/qemu-user-static/releases/download/v${qemu_version}/qemu-${qemu_arch}-static.tar.gz;
   - tar -xzvf qemu-${qemu_arch}-static.tar.gz;
+  - mv qemu-${qemu_arch}-static image/
   - make build ARCH=${target_arch}
 
 script:

From c7f24a1a9b17de1a44573525b0d51dd4225fbfa5 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 15:48:19 -0400
Subject: [PATCH 13/23] Fix BATS test for travis

---
 .Makefile.swp | Bin 1024 -> 0 bytes
 .travis.yml   |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 .Makefile.swp

diff --git a/.Makefile.swp b/.Makefile.swp
deleted file mode 100644
index abd6a20e6213f071aa82db9fcb3044300ca88541..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmYc?$V<%2S1{5u*E3;20z!fe3<a4;0(h7OnYuZti7BZ?c+`NTd=s-%(=u~X2`C$t
N9u0xf5TH{C000)93grL*

diff --git a/.travis.yml b/.travis.yml
index ff60b1b4..bcdd8a91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ install:
   - make build ARCH=${target_arch}
 
 script:
-  - make test
+  - make test ARCH=${target_arch}
 
 after_success:
   - if [ -z "$DOCKER_USER" ]; then
@@ -46,5 +46,5 @@ after_success:
       echo "Branch build, skipping Docker Hub push";
     else
       docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
-      make tag-latest push push-latest
+      make tag-latest push push-latest ARCH=${target_arch}
     fi

From 19813fc1a4fd41d70d775f499bdcff61361a5153 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 18:21:29 -0400
Subject: [PATCH 14/23] removed BATS tests from travis

---
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bcdd8a91..ac275537 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,10 +34,12 @@ install:
   - curl -sLO https://github.com/multiarch/qemu-user-static/releases/download/v${qemu_version}/qemu-${qemu_arch}-static.tar.gz;
   - tar -xzvf qemu-${qemu_arch}-static.tar.gz;
   - mv qemu-${qemu_arch}-static image/
-  - make build ARCH=${target_arch}
+  - make build ARCH=${target_arch
 
 script:
-  - make test ARCH=${target_arch}
+  - docker run ndanyluk/docker-light-baseimage-${target_arch}:1.1.2
+  - sleep 5
+  - sudo docker ps | grep docker-light-baseimage-${target_arch}
 
 after_success:
   - if [ -z "$DOCKER_USER" ]; then

From 94cc96b1a16cac5e31f041379a528eae369c1221 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 18:24:07 -0400
Subject: [PATCH 15/23] fixed missing }

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

diff --git a/.travis.yml b/.travis.yml
index ac275537..7b2837ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ install:
   - curl -sLO https://github.com/multiarch/qemu-user-static/releases/download/v${qemu_version}/qemu-${qemu_arch}-static.tar.gz;
   - tar -xzvf qemu-${qemu_arch}-static.tar.gz;
   - mv qemu-${qemu_arch}-static image/
-  - make build ARCH=${target_arch
+  - make build ARCH=${target_arch}
 
 script:
   - docker run ndanyluk/docker-light-baseimage-${target_arch}:1.1.2

From 52a95ae30529b8cc065947167f167a40333cc602 Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 18:33:41 -0400
Subject: [PATCH 16/23] added multi-arch build step

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

diff --git a/.travis.yml b/.travis.yml
index 7b2837ec..9692d5ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ services:
 env:
   global:
     - qemu_version=4.0.0
+    - target_version=1.1.2
   matrix:
     - target_arch=amd64 qemu_arch=x86_64
     - target_arch=armv7 qemu_arch=arm
@@ -37,16 +38,30 @@ install:
   - make build ARCH=${target_arch}
 
 script:
-  - docker run ndanyluk/docker-light-baseimage-${target_arch}:1.1.2
+  - docker run ndanyluk/light-baseimage-${target_arch}:${target_version}
   - sleep 5
-  - sudo docker ps | grep docker-light-baseimage-${target_arch}
+  - sudo docker ps | grep ndanyluk/light-baseimage-${target_arch}:${target_version}
 
 after_success:
   - if [ -z "$DOCKER_USER" ]; then
       echo "PR build, skipping Docker Hub push";
-    elif [ "$TRAVIS_BRANCH" != "master" ]; then
-      echo "Branch build, skipping Docker Hub push";
     else
       docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
       make tag-latest push push-latest ARCH=${target_arch}
     fi
+
+jobs:
+  include:
+    - stage: deploy
+      install: skip
+      script: skip
+      after_success:
+        - if [ -z "$DOCKER_USER" ]; then
+            echo "PR build, skipping Docker Hub push";
+          else
+            docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
+            docker manifest create ndanyluk/light-baseimage:${target_version} ndanyluk/light-baseimage-armv7:${target_version} ndanyluk/light-baseimage-arm64:${target_version} ndanyluk/light-baseimage-amd64:${target_version};
+            docker manifest create ndanyluk/light-baseimage:latest ndanyluk/light-baseimage-armv7:latest ndanyluk/light-baseimage-amd64:latest ndanyluk/light-baseimage-arm64:latest;
+            docker manifest push ndanyluk/light-baseimage:${target_version};
+            docker manifest push ndanyluk/light-baseimage:latest;
+          fi

From 13407af02b46961eca8e0f0b5da0b1682dffdccb Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 18:38:52 -0400
Subject: [PATCH 17/23] add command to docker run test step

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

diff --git a/.travis.yml b/.travis.yml
index 9692d5ef..72c730b6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - make build ARCH=${target_arch}
 
 script:
-  - docker run ndanyluk/light-baseimage-${target_arch}:${target_version}
+  - docker run ndanyluk/light-baseimage-${target_arch}:${target_version} /bin/sh
   - sleep 5
   - sudo docker ps | grep ndanyluk/light-baseimage-${target_arch}:${target_version}
 

From d1521ad62e2d0d8b131d6b80848d36c6ffaded56 Mon Sep 17 00:00:00 2001
From: ndanyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 18:48:58 -0400
Subject: [PATCH 18/23] detach docker container in test step

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 72c730b6..4ae07c8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,9 +38,9 @@ install:
   - make build ARCH=${target_arch}
 
 script:
-  - docker run ndanyluk/light-baseimage-${target_arch}:${target_version} /bin/sh
+  - docker run -d --name test_image ndanyluk/light-baseimage-${target_arch}:${target_version}
   - sleep 5
-  - sudo docker ps | grep ndanyluk/light-baseimage-${target_arch}:${target_version}
+  - sudo docker ps | grep -q test_image
 
 after_success:
   - if [ -z "$DOCKER_USER" ]; then

From f8a2ef77cede9f4449572fd27757c9716b4c6b6a Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Wed, 5 Jun 2019 23:48:53 -0400
Subject: [PATCH 19/23] fix test script

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

diff --git a/.travis.yml b/.travis.yml
index 4ae07c8b..f24c4619 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - make build ARCH=${target_arch}
 
 script:
-  - docker run -d --name test_image ndanyluk/light-baseimage-${target_arch}:${target_version}
+  - docker run -d --name test_image ndanyluk/light-baseimage-${target_arch}:${target_version} sleep 10
   - sleep 5
   - sudo docker ps | grep -q test_image
 

From b696ff05374eae969da5e2ece7a051d70ba61b0a Mon Sep 17 00:00:00 2001
From: Nick Danyluk <ndanyluk7@gmail.com>
Date: Thu, 6 Jun 2019 09:16:59 -0400
Subject: [PATCH 20/23] fixed docker push

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

diff --git a/.travis.yml b/.travis.yml
index f24c4619..07c476d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ after_success:
       echo "PR build, skipping Docker Hub push";
     else
       docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
-      make tag-latest push push-latest ARCH=${target_arch}
+      make tag-latest push push-latest ARCH=${target_arch};
     fi
 
 jobs:

From 35b2b69a857dc9abd807d4998cc44711185da21e Mon Sep 17 00:00:00 2001
From: ndanyluk <ndanyluk7@gmail.com>
Date: Thu, 6 Jun 2019 09:34:32 -0400
Subject: [PATCH 21/23] substitute osixia for ndanyluk

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 09db8e67..390c2f74 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-NAME = ndanyluk/light-baseimage
+NAME = osixia/light-baseimage
 VERSION = 1.1.2
 ARCH = amd64
 

From 84cb0ce438c30035bd18464a144987f075e7ef71 Mon Sep 17 00:00:00 2001
From: ndanyluk <ndanyluk7@gmail.com>
Date: Thu, 6 Jun 2019 09:38:44 -0400
Subject: [PATCH 22/23] substitute osixia for ndanyluk

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

diff --git a/.travis.yml b/.travis.yml
index 07c476d3..ba5cd935 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ install:
   - make build ARCH=${target_arch}
 
 script:
-  - docker run -d --name test_image ndanyluk/light-baseimage-${target_arch}:${target_version} sleep 10
+  - docker run -d --name test_image osixia/light-baseimage-${target_arch}:${target_version} sleep 10
   - sleep 5
   - sudo docker ps | grep -q test_image
 
@@ -60,8 +60,8 @@ jobs:
             echo "PR build, skipping Docker Hub push";
           else
             docker login -u "$DOCKER_USER" -p "$DOCKER_PASS";
-            docker manifest create ndanyluk/light-baseimage:${target_version} ndanyluk/light-baseimage-armv7:${target_version} ndanyluk/light-baseimage-arm64:${target_version} ndanyluk/light-baseimage-amd64:${target_version};
-            docker manifest create ndanyluk/light-baseimage:latest ndanyluk/light-baseimage-armv7:latest ndanyluk/light-baseimage-amd64:latest ndanyluk/light-baseimage-arm64:latest;
-            docker manifest push ndanyluk/light-baseimage:${target_version};
-            docker manifest push ndanyluk/light-baseimage:latest;
+            docker manifest create osixia/light-baseimage:${target_version} osixia/light-baseimage-armv7:${target_version} osixia/light-baseimage-arm64:${target_version} osixia/light-baseimage-amd64:${target_version};
+            docker manifest create osixia/light-baseimage:latest osixia/light-baseimage-armv7:latest osixia/light-baseimage-amd64:latest osixia/light-baseimage-arm64:latest;
+            docker manifest push osixia/light-baseimage:${target_version};
+            docker manifest push osixia/light-baseimage:latest;
           fi

From 15b09c897e5752b8997d132678636bae9187fd19 Mon Sep 17 00:00:00 2001
From: ndanyluk <ndanyluk7@gmail.com>
Date: Mon, 10 Jun 2019 09:22:44 -0400
Subject: [PATCH 23/23] Bump QEMU version to 4.0.0-2

Mostly security updates on the fedora package changelog
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ba5cd935..67afb59a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ services:
 
 env:
   global:
-    - qemu_version=4.0.0
+    - qemu_version=4.0.0-2
     - target_version=1.1.2
   matrix:
     - target_arch=amd64 qemu_arch=x86_64