docker

kyclark · kyclark · commit 75beeafec0c2 · 2020-01-17T17:02:24.000-07:00
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3.7.4-buster
+RUN apt-get -y update
+RUN apt-get install -y git vim emacs
+
+WORKDIR /app
+RUN git clone https://github.com/kyclark/tiny_python_projects && python3 -m pip install -r /app/tiny_python_projects/requirements.txt
+
+CMD ["python3", "--version"]
diff --git a/docker/Makefile b/docker/Makefile
@@ -0,0 +1,10 @@
+TAG = kyclark/tiny_python_projects:0.1.0
+
+img:
+	docker build --tag=$(TAG) .
+
+shell:
+	docker run -it $(TAG) bash
+
+push: 
+	docker push $(TAG)
diff --git a/docker/README.md b/docker/README.md
@@ -0,0 +1,6 @@
+# Tiny Python Projects Docker
+
+```
+$ docker pull kyclark/tiny_python_projects:0.1.0
+$ docker run -it --rm kyclark/tiny_python_projects:0.1.0 bash
+```
diff --git a/wod/silly-exercises.csv b/wod/silly-exercises.csv
diff --git a/wod/solution.py b/wod/solution.py
diff --git a/wod/test.py b/wod/test.py
@@ -6,6 +6,8 @@
 from subprocess import getstatusoutput
 
 prg = './wod.py'
+input1 = 'exercises.csv'
+input2 = 'silly-exercises.tab'
 
 
 # --------------------------------------------------
@@ -20,7 +22,7 @@ def test_usage():
     """usage"""
 
     for flag in ['-h', '--help']:
-        rv, out = getstatusoutput('{} {}'.format(prg, flag))
+        rv, out = getstatusoutput(f'{prg} {flag}')
         assert rv == 0
         assert out.lower().startswith('usage')
 
@@ -39,7 +41,7 @@ def test_runs01():
 """
 
     seed_flag = '-s' if random.choice([0, 1]) else '--seed'
-    rv, out = getstatusoutput('{} {} {}'.format(prg, seed_flag, 1))
+    rv, out = getstatusoutput(f'{prg} {seed_flag} 1')
     assert rv == 0
     assert out.strip() == expected.strip()
 
@@ -59,8 +61,7 @@ def test_runs02():
 
     seed_flag = '-s' if random.choice([0, 1]) else '--seed'
     easy_flag = '-e' if random.choice([0, 1]) else '--easy'
-    rv, out = getstatusoutput('{} {} {} {}'.format(prg, easy_flag, seed_flag,
-                                                   1))
+    rv, out = getstatusoutput(f'{prg} {easy_flag} {seed_flag} 1')
     assert rv == 0
     assert out.strip() == expected.strip()
 
@@ -84,8 +85,7 @@ def test_runs03():
 
     seed_flag = '-s' if random.choice([0, 1]) else '--seed'
     num_flag = '-n' if random.choice([0, 1]) else '--num_exercises'
-    rv, out = getstatusoutput('{} {} 8 {} 2 -f wod.csv'.format(
-        prg, num_flag, seed_flag))
+    rv, out = getstatusoutput(f'{prg} {num_flag} 8 {seed_flag} 2 -f {input1}')
     assert rv == 0
     assert out.strip() == expected.strip()
 
@@ -104,7 +104,6 @@ def test_runs04():
 
     seed_flag = '-s' if random.choice([0, 1]) else '--seed'
     num_flag = '-n' if random.choice([0, 1]) else '--num_exercises'
-    rv, out = getstatusoutput('{} {} 3 {} 4 -f wod2.csv'.format(
-        prg, num_flag, seed_flag))
+    rv, out = getstatusoutput(f'{prg} {num_flag} 3 {seed_flag} 4 -f {input2}')
     assert rv == 0
     assert out.strip() == expected.strip()
