From 23381f7d170d8dcf1aabcbb26f5dbe04816ca0a8 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 13:13:52 +0100
Subject: [PATCH 01/13] Added multi arch docker builds to travis ci

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

diff --git a/.travis.yml b/.travis.yml
index b745d6bd7..307a6073a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,102 @@ jobs:
         - ng build --prod
       after_success: true
 
+    - stage: build_docker
+      name: amd64 docker build
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        - docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 .
+        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+    - stage: build_docker
+      name: arm64v8 docker build
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
+        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
+        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
+      arch: arm64
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+    
+    - stage: build_docker
+      name: arm32v7 docker build
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
+        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
+        # which is amd64.
+        - sed -i 's/FROM node:15/FROM node@sha256:e9bf2028bd59399afd3f6665f427a07b7ddfee07cffdf2061c39d991a3b3e332/g' Dockerfile
+        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:843dd86fa35b923095b5db60c6e2e296013d647c8327aeba0e7638e7f0a43373/g' Dockerfile
+        # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
+        - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
+        - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+    
+    - stage: publish_manifest
+      env:
+        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
+      services:
+        - docker
+      before_install:
+        - true
+      install:
+        - true
+      after_success:
+        - true
+      script:
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
+        - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
+        - docker manifest push --purge ${DOCKER_REPO}:${TRAVIS_COMMIT}
+        - |
+          if [ "${TRAVIS_BRANCH}" = "master" ]; then
+            echo "Master branch detected"
+            DOCKER_TAG="latest"
+          else
+            DOCKER_TAG=${TRAVIS_TAG}
+          fi
+        - |
+          if [ "${DOCKER_TAG}" != "" ]; then
+            echo "Create Tag ${DOCKER_TAG}"
+            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
+            docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
+            docker manifest push --purge ${DOCKER_REPO}:${DOCKER_TAG}
+          else
+            echo "Not a tag and not on master, so not pushing tag/master specific manifest"
+          fi
+      on:
+        condition: '"${BUILD_DOCKER}" = 1'
+
 
 before_install:
   - sudo apt-get update -qq

From ba18258750e06d4a9f6529baf3722ec467474a88 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 16:19:24 +0100
Subject: [PATCH 02/13] Add libxslt-dev to dependencies.

At least one arm based image does not pull in dependencies the same way
the amd64 one does, resulting in a missing libxslt shared lib.
---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 732b4183c..016bf7da9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,7 @@ RUN apt-get update \
 		libpq-dev \
 		libqpdf-dev \
 		libxml2 \
+		libxslt-dev \
 		optipng \
 		pngquant \
 		qpdf \

From 7817315f8b4b6fb9c95c08f4f788a8c068c4b401 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 17:08:01 +0100
Subject: [PATCH 03/13] Adding some echos to bette runderstand where the build
 hangs

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

diff --git a/.travis.yml b/.travis.yml
index 307a6073a..203861391 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,9 +60,12 @@ jobs:
       after_success:
         - true
       script:
+        - echo "Starting arm64v8 build, login to docker"
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
+        - echo "Build ..."
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
+        - echo "Push"
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64
       on:

From 48b59c8e24081d06d9c38457517cf55cdcc5f79b Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Mon, 21 Dec 2020 21:53:39 +0100
Subject: [PATCH 04/13] Use qemu also for arm64v8 build - something might be
 causing trouble on the native hosts

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

diff --git a/.travis.yml b/.travis.yml
index 203861391..d2534c152 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,14 +60,17 @@ jobs:
       after_success:
         - true
       script:
-        - echo "Starting arm64v8 build, login to docker"
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
+        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
+        # which is amd64.
+        - sed -i 's/FROM node:15/FROM node@sha256:5a14c8bf5020253f322b8f1f6bec4c34cafb0097acf1c1155506ee17b3c71119/g' Dockerfile
+        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:d75eb820f62221ce8e40c5d8dbe988aa417e88553ef095a4a7591d7318da8486/g' Dockerfile
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
-        - echo "Build ..."
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
-        - echo "Push"
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
-      arch: arm64
+      arch: amd64
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From 7d1f931234147bb4588778fda9d3b1fccf4a7ecd Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 12:49:36 +0100
Subject: [PATCH 05/13] Use arm64-gravis instead of regular arm64. See if that
 is fast enough.

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

diff --git a/.travis.yml b/.travis.yml
index d2534c152..b91e43a28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,17 +60,12 @@ jobs:
       after_success:
         - true
       script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        # register binfmt stuff for qemu-static binaries so we can use userland-emulation
-        - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-        # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
-        # which is amd64.
-        - sed -i 's/FROM node:15/FROM node@sha256:5a14c8bf5020253f322b8f1f6bec4c34cafb0097acf1c1155506ee17b3c71119/g' Dockerfile
-        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:d75eb820f62221ce8e40c5d8dbe988aa417e88553ef095a4a7591d7318da8486/g' Dockerfile
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin"
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
-      arch: amd64
+      arch: arm64-graviton2
+      virt: vm      
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From bf3b110804597af01ade2047527582d9f24ae9b2 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 12:58:35 +0100
Subject: [PATCH 06/13] Remove accidentially added quote

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

diff --git a/.travis.yml b/.travis.yml
index b91e43a28..5f838755d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ jobs:
       after_success:
         - true
       script:
-        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin"
+        - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8

From 162626209c82ce8f8f286790302a279afdac6f86 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:27:19 +0100
Subject: [PATCH 07/13] Tell me, what kind of arm64 is it that produces amd64
 docker images?

It's weird
---
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f838755d..f99a52eba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,12 +60,13 @@ jobs:
       after_success:
         - true
       script:
+        - uname -a
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64-graviton2
-      virt: vm      
+      virt: lxc
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     
@@ -85,8 +86,8 @@ jobs:
         - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
         # replace the multi-arch reference with a specific, arm32v7 version. else docker will use the platform specific one,
         # which is amd64.
-        - sed -i 's/FROM node:15/FROM node@sha256:e9bf2028bd59399afd3f6665f427a07b7ddfee07cffdf2061c39d991a3b3e332/g' Dockerfile
-        - sed -i 's/FROM python:3.7-slim/FROM python@sha256:843dd86fa35b923095b5db60c6e2e296013d647c8327aeba0e7638e7f0a43373/g' Dockerfile
+        - sed -i "s/FROM node:15/FROM node@$(docker manifest inspect node:15 | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
+        - sed -i "s/FROM python:3.7-slim/FROM python@$(docker manifest inspect python:3.7-slim | jq -r '.manifests [] | select (.platform.variant == "v7") | .digest')/g" Dockerfile
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7

From e8ea373eb2c4e3a686e07d2fc8919b0b15bb3281 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:42:21 +0100
Subject: [PATCH 08/13] Enable manifests support

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

diff --git a/.travis.yml b/.travis.yml
index f99a52eba..6d26d6ccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,6 +91,8 @@ jobs:
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
+      env:
+        - DOCKER_CLI_EXPERIMENTAL=enabled # required for manifest support
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From 46ecdefde84eb581b038da1cdc2728cc3f11ea8d Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 13:43:51 +0100
Subject: [PATCH 09/13] Remove steps not necessary to build docker images

---
 .travis.yml | 54 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6d26d6ccb..c04f765d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,33 +5,33 @@ os: linux
 
 jobs:
   include:
-    - name: "Paperless on Python 3.6"
-      python: "3.6"
-
-    - name: "Paperless on Python 3.7"
-      python: "3.7"
-
-    - name: "Paperless on Python 3.8"
-      python: "3.8"
-
-    - name: "Documentation"
-      script:
-        - cd docs/
-        - make html
-      after_success: true
-
-    - name: "Front end"
-      language: node_js
-      node_js:
-        - 15
-      before_install: true
-      install:
-        - cd src-ui/
-        - npm install -g @angular/cli
-        - npm install
-      script:
-        - ng build --prod
-      after_success: true
+#    - name: "Paperless on Python 3.6"
+#      python: "3.6"
+#
+#    - name: "Paperless on Python 3.7"
+#      python: "3.7"
+#
+#    - name: "Paperless on Python 3.8"
+#      python: "3.8"
+#
+#    - name: "Documentation"
+#      script:
+#        - cd docs/
+#        - make html
+#      after_success: true
+#
+#    - name: "Front end"
+#      language: node_js
+#      node_js:
+#        - 15
+#      before_install: true
+#      install:
+#        - cd src-ui/
+#        - npm install -g @angular/cli
+#        - npm install
+#      script:
+#        - ng build --prod
+#      after_success: true
 
     - stage: build_docker
       name: amd64 docker build

From c751fe752079bf1367944e81c26a4d718a4531be Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 14:15:06 +0100
Subject: [PATCH 10/13] Switching back to virt: vm as there seems to be a prob
 with the lxc ones

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

diff --git a/.travis.yml b/.travis.yml
index c04f765d0..9803a4d3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -66,7 +66,7 @@ jobs:
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64-graviton2
-      virt: lxc
+      virt: vm
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From 1f62b6d0d4c44516818a3e8e5d6e3efaa50f97f2 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Tue, 22 Dec 2020 14:18:11 +0100
Subject: [PATCH 11/13] arm64-graviton2 build requires group:edge

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

diff --git a/.travis.yml b/.travis.yml
index 9803a4d3b..8422229c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -67,6 +67,7 @@ jobs:
         - docker push ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8
       arch: arm64-graviton2
       virt: vm
+      group: edge
       on:
         condition: '"${BUILD_DOCKER}" = 1'
     

From ccfa14b9b7c48ed60fc49ce64d673dde02edb308 Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 23 Dec 2020 09:14:40 +0100
Subject: [PATCH 12/13] Remove arm32v6 from docker manifest , it is not getting
 created

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

diff --git a/.travis.yml b/.travis.yml
index 8422229c7..281635ace 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -110,7 +110,7 @@ jobs:
         - true
       script:
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
-        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+        - docker manifest create ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
         - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
         - docker manifest annotate ${DOCKER_REPO}:${TRAVIS_COMMIT} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
         - docker manifest push --purge ${DOCKER_REPO}:${TRAVIS_COMMIT}
@@ -124,7 +124,7 @@ jobs:
         - |
           if [ "${DOCKER_TAG}" != "" ]; then
             echo "Create Tag ${DOCKER_TAG}"
-            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v6
+            docker manifest create ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-amd64 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7
             docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm32v7 --os linux --arch arm --variant v7
             docker manifest annotate ${DOCKER_REPO}:${DOCKER_TAG} ${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 --os linux --arch arm64 --variant v8
             docker manifest push --purge ${DOCKER_REPO}:${DOCKER_TAG}

From 8135de49f00e01170c1450f380fb1789626d68af Mon Sep 17 00:00:00 2001
From: Mark Schmitt <31215086+MarkSchmitt@users.noreply.github.com>
Date: Wed, 23 Dec 2020 12:13:12 +0100
Subject: [PATCH 13/13] Re-enable test steps

---
 .travis.yml | 55 ++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 281635ace..e5f3cd91e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,33 +5,33 @@ os: linux
 
 jobs:
   include:
-#    - name: "Paperless on Python 3.6"
-#      python: "3.6"
-#
-#    - name: "Paperless on Python 3.7"
-#      python: "3.7"
-#
-#    - name: "Paperless on Python 3.8"
-#      python: "3.8"
-#
-#    - name: "Documentation"
-#      script:
-#        - cd docs/
-#        - make html
-#      after_success: true
-#
-#    - name: "Front end"
-#      language: node_js
-#      node_js:
-#        - 15
-#      before_install: true
-#      install:
-#        - cd src-ui/
-#        - npm install -g @angular/cli
-#        - npm install
-#      script:
-#        - ng build --prod
-#      after_success: true
+    - name: "Paperless on Python 3.6"
+      python: "3.6"
+
+    - name: "Paperless on Python 3.7"
+      python: "3.7"
+
+    - name: "Paperless on Python 3.8"
+      python: "3.8"
+
+    - name: "Documentation"
+      script:
+        - cd docs/
+        - make html
+      after_success: true
+
+    - name: "Front end"
+      language: node_js
+      node_js:
+        - 15
+      before_install: true
+      install:
+        - cd src-ui/
+        - npm install -g @angular/cli
+        - npm install
+      script:
+        - ng build --prod
+      after_success: true
 
     - stage: build_docker
       name: amd64 docker build
@@ -60,7 +60,6 @@ jobs:
       after_success:
         - true
       script:
-        - uname -a
         - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
         # travis_wait 60 tells travis to wait for up to 60 minutes - default is 20, which is too short
         - travis_wait 60 docker build -f Dockerfile --tag=${DOCKER_REPO}:${TRAVIS_COMMIT}-arm64v8 .