[devenv] updated to ubuntu 22 and mysql 8 with minor fixes

Author: cu2

.devcontainer/docker-compose.yml

@@ -1,6 +1,3 @@
-version: '3.7'
-
-
 services:
 
   kt:

README.md

@@ -5,7 +5,7 @@
 
 ## How to install KT
 
-You need [Docker](https://docs.docker.com/install/) and [docker-compose](https://docs.docker.com/compose/install/) installed on your machine.
+You need [Docker](https://docs.docker.com/install/) installed on your machine.
 
 Install KT with this script:
 ```

docker/dev/Dockerfile

@@ -1,13 +1,19 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y \
-    python-minimal \
+    python2-dev \
     python-pip \
-    libmysqlclient-dev
+    libmysqlclient-dev \
+    libjpeg-dev
+
+# Client programs should only need to #include the <mysql.h> header file.
+# In particular, <my_config.h> should not be needed, and is no longer installed.
+# https://stackoverflow.com/a/69382475
+RUN ln -s /usr/include/mysql/mysql.h /usr/include/mysql/my_config.h
 
 COPY requirements.txt /tmp/
-RUN pip install -r /tmp/requirements.txt
+RUN python2 -m pip install -r /tmp/requirements.txt
 
 WORKDIR /app
 
-CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
+CMD ["python2", "manage.py", "runserver", "0.0.0.0:8000"]

docker/dev/docker-compose.yml

@@ -1,6 +1,3 @@
-version: '3.7'
-
-
 services:
 
   kt:
@@ -12,16 +9,23 @@ services:
     ports:
       - '8000:8000'
     depends_on:
-      - db
+      db:
+        condition: service_healthy
 
   db:
-    image: mysql:5.7
+    image: mysql:8.0
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
     volumes:
       - type: volume
         source: db-data
         target: /var/lib/mysql
+    healthcheck:
+      test: mysqladmin ping -h 127.0.0.1 -u $$MYSQL_USER --password=$$MYSQL_PASSWORD
+      start_period: 5s
+      interval: 5s
+      timeout: 5s
+      retries: 10
 
 
 volumes:

scripts/create-dev-db.sql

@@ -1,3 +1,4 @@
 CREATE DATABASE ktdb_dev CHARACTER SET utf8 COLLATE utf8_hungarian_ci;
-GRANT ALL ON ktdb_dev.* TO ktadmin@'%' IDENTIFIED BY 'password';
+CREATE USER IF NOT EXISTS ktadmin@'%' IDENTIFIED BY 'password';
+GRANT ALL ON ktdb_dev.* TO ktadmin@'%';
 FLUSH PRIVILEGES;

scripts/init-dev-db.sh

@@ -8,7 +8,7 @@ DC_FILE="${__root_dir}/docker/dev/docker-compose.yml"
 PROJECT_NAME="kt-dev"
 
 function dc {
-  docker-compose -f "${DC_FILE}" -p "${PROJECT_NAME}" "$@"
+  docker compose -f "${DC_FILE}" -p "${PROJECT_NAME}" "$@"
 }
 
 function stop_system {
@@ -26,11 +26,11 @@ KT_CONTAINER_ID=$(dc ps -q kt)
 sleep 5  # TODO: wait until logline "mysqld: ready for connections"
 docker exec -i "${DB_CONTAINER_ID}" mysql -u root < "${__dir}/create-dev-db.sql"
 sleep 5  # TODO: why is some waiting needed?
-docker exec "${KT_CONTAINER_ID}" python manage.py migrate
+docker exec "${KT_CONTAINER_ID}" python2 manage.py migrate
 echo 'Initialized.'
 
 echo 'Loading test data...'
-docker exec "${KT_CONTAINER_ID}" python manage.py loaddata fixtures/initial_data.json
+docker exec "${KT_CONTAINER_ID}" python2 manage.py loaddata fixtures/initial_data.json
 echo 'Loaded'
 
 # NOTE: trap is doing "dc down"

scripts/show-logs.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 __root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd .. && pwd)"
 
 
-docker-compose \
+docker compose \
   -f "${__root_dir}/docker/dev/docker-compose.yml" \
   -p kt-dev \
   logs -f --tail=20 kt

scripts/start-dev.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 __root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd .. && pwd)"
 
 
-docker-compose \
+docker compose \
   -f "${__root_dir}/docker/dev/docker-compose.yml" \
   -p kt-dev \
   up -d

scripts/stop-dev.sh

@@ -4,7 +4,7 @@ set -euo pipefail
 __root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd .. && pwd)"
 
 
-docker-compose \
+docker compose \
   -f "${__root_dir}/docker/dev/docker-compose.yml" \
   -p kt-dev \
   down