Update codebase

.devcontainer/devcontainer.json

@@ -0,0 +1,27 @@
+{
+  "name": "ParkkiHubi",
+  "dockerComposeFile": [
+    "../docker-compose.yml",
+    "docker-compose.yml"
+  ],
+  "service": "runserver",
+  "workspaceFolder": "/home/bew/bew",
+  "runServices": [
+    "runserver",
+    "postgresql",
+    "memcached"
+  ],
+  "shutdownAction": "stopCompose",
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-python.python",
+        "donjayamanne.githistory",
+        "eamodio.gitlens",
+        "davidanson.vscode-markdownlint",
+        "dakara.transformer"
+      ]
+    }
+  },
+  "postCreateCommand": "cp -n local_settings.py.tpl_dev local_settings.py"
+}

.devcontainer/docker-compose.yml

@@ -0,0 +1,5 @@
+---
+version: '3'
+services:
+  runserver:
+    command: /bin/sh -c "while sleep 1000; do :; done"

.gitignore

@@ -22,6 +22,9 @@ tags
 # Linux trash folder which might appear on any partition or disk
 .Trash-*
 
+# User files
+.ssh
+
 # .nfs files are created when an open file is removed but is still being accessed
 .nfs*
 ### macOS template
@@ -56,6 +59,7 @@ Temporary Items
 __pycache__/
 *.py[cod]
 *$py.class
+*.pyc
 
 # C extensions
 *.so
@@ -107,6 +111,9 @@ coverage.xml
 # Django stuff:
 *.log
 local_settings.py
+mediaroot/
+staticroot/
+database.db
 
 # Flask stuff:
 instance/
@@ -201,6 +208,9 @@ fabric.properties
 Thumbs.db
 ehthumbs.db
 
+# New Relic configuration file
+newrelic.ini
+
 # Folder config file
 Desktop.ini
 

.vscode/launch.json

@@ -0,0 +1,86 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Django: Runserver",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": [
+        "runserver",
+        "0.0.0.0:8000"
+      ],
+      "django": true,
+      "justMyCode": false,
+      "subProcess": true
+    },
+    {
+      "name": "Django: Runserver - nonthreading",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": [
+        "runserver",
+        "--nothreading",
+        "0.0.0.0:8000"
+      ],
+      "django": true,
+      "justMyCode": false,
+      "subProcess": true
+    },
+    {
+      "name": "Django: Shell",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": [
+        "shell"
+      ],
+      "django": true,
+      "justMyCode": false
+    },
+    {
+      "name": "Django: Migrate",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": [
+        "migrate"
+      ],
+      "django": true,
+      "justMyCode": false
+    },
+    {
+      "name": "Django: Make migrations",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": [
+        "makemigrations"
+      ],
+      "django": true,
+      "justMyCode": false
+    },
+    {
+      "name": "Django: Collectstatic",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/manage.py",
+      "args": [
+        "collectstatic",
+        "--no-input"
+      ],
+      "django": true,
+      "justMyCode": false
+    },
+    {
+      "name": "Run pytest",
+      "type": "python",
+      "request": "launch",
+      "module": "pytest",
+      "args": [],
+      "django": true,
+      "justMyCode": false
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,17 @@
+{
+  "python.defaultInterpreterPath": "../.venv/bin/python3",
+  "git.autofetch": true,
+  "git.autoStash": true,
+  "git.fetchOnPull": true,
+  "editor.renderWhitespace": "all",
+  "editor.renderControlCharacters": true,
+  "files.trimTrailingWhitespace": true,
+  "zenMode.hideLineNumbers": false,
+  "zenMode.centerLayout": false,
+  "zenMode.fullScreen": false,
+  "gitlens.codeLens.enabled": false,
+  "gitlens.currentLine.enabled": false,
+  "[python]": {
+    "editor.tabSize": 2
+  }
+}

Dockerfile

@@ -1,48 +1,50 @@
-FROM python:3.7-slim as appbase
-
-ENV PYTHONBUFFERED 1
-
-RUN apt-get update  \
-    && \
-    apt-get install --no-install-recommends -y \
-      gdal-bin \
-      python3-gdal \
-      netcat \
-      libpq-dev \
-      build-essential
-
-WORKDIR /app
-
-COPY requirements.txt ./requirements.txt
-
-RUN pip install --no-cache-dir -r requirements.txt \
-    && \
-    apt-get remove -y build-essential libpq-dev \
-    && \
-    apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    && \
-    rm -rf /var/lib/apt/lists/* \
-    && \
-    rm -rf /var/cache/apt/archives
-
-
-COPY . .
-
-ENTRYPOINT ["/app/django-entrypoint.sh"]
-
-# TODO: Production environment
-# Production environment
-# CMD ["production"]
-
-
-# Development environment
-FROM appbase as development
-
-COPY requirements-*.txt ./
-
-RUN pip install --no-cache-dir \
-    -r requirements-dev.txt \
-    -r requirements-style.txt \
-    -r requirements-test.txt
-
-CMD ["development"]
+FROM ubuntu:jammy-20231004
+
+ENV USER=root DEBIAN_FRONTEND=noninteractive
+VOLUME ["/var/cache/apt/archives"]
+RUN touch /.dockerenv
+
+RUN apt-get update \
+    && apt-get install --yes \
+        git \
+        sudo \
+        vim \
+        zsh \
+    && echo '%sudo ALL=(ALL:ALL) NOPASSWD: ALL' > /etc/sudoers.d/sudo_nopasswd \
+    && apt-get install --yes --no-install-recommends \
+        gdal-bin \
+        python3 \
+        python3-cryptography \
+        python3-lxml \
+        python3-memcache \
+        python3-ndg-httpsclient \
+        python3-paste \
+        python3-pil \
+        python3-pip \
+        python3-psycopg2 \
+        python3-pyasn1 \
+        python3-pyproj \
+        python3-rcssmin \
+        python3-requests \
+        python3-six \
+        python3-socks \
+        python3-urllib3 \
+        python3-venv \
+        python3-wheel
+
+RUN useradd -m -u 1000 bew
+RUN usermod -aG sudo -s /usr/bin/zsh bew
+COPY zshrc /home/bew/.zshrc
+RUN chown -R bew:bew /home/bew
+
+USER bew
+ENV USER=bew
+ENV PYTHONDONTWRITEBYTECODE=1
+WORKDIR /home/bew/bew
+
+COPY --chown=bew:bew . /home/bew/bew/
+
+RUN python3.10 -m venv --system-site-packages /home/bew/.venv
+RUN /home/bew/.venv/bin/pip3 install -r /home/bew/bew/requirements.txt
+
+CMD /bin/zsh