From ec0b89039c3d4e961e2d1519364a02fc28ef71e0 Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Mon, 8 Nov 2021 22:04:21 -0800
Subject: [PATCH] working server builds

---
 .dockerignore         | 3 ++-
 Dockerfile            | 2 +-
 Makefile              | 5 ++++-
 backupdb2/__init__.py | 2 +-
 backupdb2/cli.py      | 2 +-
 backupdb2/common.py   | 3 ---
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 8500e31..1427313 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,5 @@
-/testenv/
+testenv/*
+testdata/*
 build/*
 dist/*
 *.egg-info/*
diff --git a/Dockerfile b/Dockerfile
index 3cb02a2..09fff2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ RUN cd /tmp/code && \
 
 USER nobody
 
-ENTRYPOINT ["packagecli"]
+ENTRYPOINT ["backupdbserver"]
diff --git a/Makefile b/Makefile
index 0970dbc..ce8355c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DOCKERIMAGE := dockermirror:5000/dpedu/package
+DOCKERIMAGE := dockermirror:5000/dpedu/backupdb2
 DOCKEROPTS :=
 BINARY := dist/package-0.0.0-py3-none-any.whl
 
@@ -18,3 +18,6 @@ push: image
 testenv:
 	virtualenv -p python3 testenv
 	testenv/bin/pip3 install -r requirements.txt
+
+build-kaniko:
+	kanikoclient $(DOCKERIMAGE)
diff --git a/backupdb2/__init__.py b/backupdb2/__init__.py
index 3aa0d7b..6c8e6b9 100644
--- a/backupdb2/__init__.py
+++ b/backupdb2/__init__.py
@@ -1 +1 @@
-__version__ = "0.0.0"
\ No newline at end of file
+__version__ = "0.0.0"
diff --git a/backupdb2/cli.py b/backupdb2/cli.py
index 20cea9e..9d55dad 100644
--- a/backupdb2/cli.py
+++ b/backupdb2/cli.py
@@ -271,7 +271,7 @@ def get_args():
 
     p_download = sp_action.add_parser("download", help="download action")
     p_download.set_defaults(func=cmd_download)
-    p_download.add_argument("-n", "--namespace", default="default", help="parent namespace download from")
+    p_download.add_argument("-n", "--namespace", default="default", help="parent namespace to download from")
     p_download.add_argument("backup", help="backup to download")
     p_download.add_argument("date", help="date of backup to download")
 
diff --git a/backupdb2/common.py b/backupdb2/common.py
index 0011730..865e800 100644
--- a/backupdb2/common.py
+++ b/backupdb2/common.py
@@ -11,9 +11,6 @@ STREAM_CHUNK_SIZE = int(os.environ.get("BACKUPDB_STREAM_CHUNK_SIZE", 1024 * 1024
 LOCKFILE = ".datadb.lock"
 
 
-import botocore.errorfactory
-
-
 class BackupManager(object):
     """
     Client for listing/reading backups