updated tests, Docker, README

Author: dmalan

Dockerfile

@@ -1,5 +1,6 @@
 FROM cs50/cli
 
-RUN sudo apt update && sudo apt install --yes libmysqlclient-dev
+RUN sudo apt update && sudo apt install --yes libmysqlclient-dev pgloader postgresql
 RUN sudo pip3 install mysqlclient psycopg2-binary
+
 WORKDIR /mnt

README.md

@@ -22,27 +22,25 @@ s = cs50.get_string();
 
 ## Testing
 
-1. Run `cli50` in `python-cs50`.
-1. Run `sudo su -`.
-1. Run `apt update`.
-1. Run `apt install -y libmysqlclient-dev mysql-server postgresql`.
-1. Run `pip3 install mysqlclient psycopg2-binary`.
-1. In `/etc/mysql/mysql.conf.d/mysqld.cnf`, add `skip-grant-tables` under `[mysqld]`.
-1. In `/etc/profile.d/cli.sh`, remove `valgrind` function for now.
-1. Run `service mysql start`.
-1. Run `mysql -e 'CREATE DATABASE IF NOT EXISTS test;'`.
-1. In `/etc/postgresql/12/main/pg_hba.conf`, change:
-   ```
-   local   all             postgres                                peer
-   host    all             all             127.0.0.1/32            md5
-   ```
-   to:
-   ```
-   local   all             postgres                                trust
-   host    all             all             127.0.0.1/32            trust
-   ```
-1. Run `service postgresql start`.
-1. Run `psql -c 'create database test;' -U postgres`.
+1. In one terminal, execute:
+
+    ```
+    cd python-cs50
+    docker compose build
+    docker compose up
+    ```
+
+1. In another terminal, execute:
+
+    ```
+    docker exec -it python-cs50 bash -l
+    ```
+
+    And then execute, e.g.:
+
+    ```
+    python tests/sql.py
+    ```
 
 ### Sample Tests
 

docker-compose.yml

@@ -27,7 +27,7 @@ services:
     ports:
       - 3306:3306
   postgres:
-    image: postgres
+    image: postgres:12
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres

tests/sql.py

@@ -155,7 +155,7 @@ def tearDownClass(self):
 class MySQLTests(SQLTests):
     @classmethod
     def setUpClass(self):
-        self.db = SQL("mysql://root@127.0.0.1/test")
+        self.db = SQL("mysql://root@mysql/test")
 
     def setUp(self):
         self.db.execute("CREATE TABLE IF NOT EXISTS cs50 (id INTEGER NOT NULL AUTO_INCREMENT, val VARCHAR(16), bin BLOB, PRIMARY KEY (id))")
@@ -165,7 +165,7 @@ def setUp(self):
 class PostgresTests(SQLTests):
     @classmethod
     def setUpClass(self):
-        self.db = SQL("postgresql://postgres:postgres@127.0.0.1/test")
+        self.db = SQL("postgresql://postgres:postgres@postgres/test")
 
     def setUp(self):
         self.db.execute("CREATE TABLE IF NOT EXISTS cs50 (id SERIAL PRIMARY KEY, val VARCHAR(16), bin BYTEA)")