WIP: Podman 0.2

.env

@@ -1 +1,9 @@
 CI_PROJECT_DIR=.
+SCRAM_PEERING_IFACE=eth1
+SCRAM_V4_SUBNET=10.124.0.0/24
+SCRAM_V4_GATEWAY=10.124.0.1
+SCRAM_V4_ADDRESS=10.124.0.4
+SCRAM_V6_SUBNET=2004:600:202:9::8/126
+SCRAM_V6_GATEWAY=2004:600:202:9::9
+SCRAM_V6_ADDRESS=2004:600:202:9::a
+HOSTNAME=$(hostname)

.envs/.production/.django

@@ -0,0 +1,35 @@
+# General
+# ------------------------------------------------------------------------------
+#DJANGO_READ_DOT_ENV_FILE=True
+#DJANGO_SETTINGS_MODULE=config.settings.production
+#DJANGO_SECRET_KEY=
+#DJANGO_ADMIN_URL=admin/
+#DJANGO_ALLOWED_HOSTS=
+# Security
+# ------------------------------------------------------------------------------
+# TIP: better off using DNS, however, redirect is OK too
+#DJANGO_SECURE_SSL_REDIRECT=False
+
+# Email
+# ------------------------------------------------------------------------------
+#DJANGO_SERVER_EMAIL=test@test.com
+
+# Gunicorn
+# ------------------------------------------------------------------------------
+#WEB_CONCURRENCY=4
+
+# Redis
+# ------------------------------------------------------------------------------
+#REDIS_URL=redis://redis:6379/0
+
+#SCRAM_AUTH_METHOD=oidc
+#SCRAM_AUTH_METHOD=local
+#OIDC_OP_JWKS_ENDPOINT=
+#OIDC_OP_AUTHORIZATION_ENDPOINT=
+#OIDC_OP_TOKEN_ENDPOINT=
+#OIDC_OP_USER_ENDPOINT=
+#OIDC_RP_SIGN_ALGO=RS256
+
+
+
+#OIDC_RP_CLIENT_ID=

.envs/.production/.postgres

@@ -0,0 +1,7 @@
+# PostgreSQL
+# ------------------------------------------------------------------------------
+#POSTGRES_HOST=postgres
+#POSTGRES_PORT=5432
+#POSTGRES_DB=scram
+#POSTGRES_USER=scram
+#POSTGRES_PASSWORD=scram

.envs/.production/.translator

@@ -0,0 +1,4 @@
+# Translator
+# ------------------------------------------------------------------------------
+#TRANSLATOR_HOSTNAME=localhost
+#TRANSLATOR_URL="ws://django:5000/ws/route_manager/translator_block/"

.gitignore

@@ -7,11 +7,6 @@ __pycache__/
 # Ignore prod nginx files so git doesnt think we've locally added new files when deploying templates with ansible
 compose/production/nginx
 
-.idea/
-.idea/*
-.idea/scram.iml
-*.iml
-
 # C extensions
 *.so
 
@@ -63,6 +58,9 @@ staticfiles/
 
 # Sphinx documentation
 docs/_build/
+docs/api
+docs/*.db
+
 
 # PyBuilder
 target/
@@ -162,6 +160,7 @@ typings/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+*.code-workspace
 
 
 # Provided default Pycharm Run/Debug Configurations should be tracked by git
@@ -172,7 +171,13 @@ typings/
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-.idea/*
+# Allow Debugger Files
+/.idea/runConfigurations/*.xml
+/.idea/inspectionProfiles
+!.idea/runConfigurations/*_Debugger.xml
+
+.idea/scram.iml
+*.iml
 
 # User-specific stuff:
 .idea/**/workspace.xml
@@ -334,6 +339,7 @@ scram/media/
 
 
 .ipython/
+# envs are now stored in compose file
 .envs/*
 !.envs/.local/
 compose.override.yml

.gitlab-ci.yml

@@ -7,7 +7,6 @@ include:
 stages:
 - lint
 - test
-- cleanup
 
 variables:
   POSTGRES_USER: scram
@@ -28,6 +27,8 @@ pytest:
   image: docker:24.0.6-dind
   services:
   - docker:dind
+  variables:
+    POSTGRES_ENABLED: 1
   before_script:
   - apk add make
   - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
@@ -38,12 +39,18 @@ pytest:
   - make migrate
   - make run
   script:
+  - export COMPOSE_PROJECT_NAME=$CI_PIPELINE_ID
   - make coverage.xml
   artifacts:
     reports:
       coverage_report:
         coverage_format: cobertura
         path: coverage.xml
+  after_script:
+    - export COMPOSE_PROJECT_NAME=$CI_PIPELINE_ID
+    - make stop
+    - make clean
+
 
 gemnasium-dependency_scanning:
   variables:
@@ -59,17 +66,3 @@ code_quality_html:
 
 sast:
   stage: test
-
-final_clean:
-  image: docker:24.0.6-dind
-  services:
-  - docker:dind
-  before_script:
-  - apk add make
-  - export COMPOSE_PROJECT_NAME=$CI_PIPELINE_ID
-  stage: cleanup
-  rules:
-    - when: always # run even if something failed
-  script:
-    - make stop
-    - make clean

.vscode/launch.json

@@ -0,0 +1,38 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Django Debugger",
+            "type": "debugpy",
+            "request": "attach",
+            "connect": {
+                "host": "0.0.0.0",
+                "port": 56780
+            },
+            "pathMappings": [
+                {
+                    "localRoot": "${workspaceFolder}",
+                    "remoteRoot": "/app"
+                }
+            ]
+        },
+        {
+            "name": "Translator Debugger",
+            "type": "debugpy",
+            "request": "attach",
+            "connect": {
+                "host": "0.0.0.0",
+                "port": 56781
+            },
+            "pathMappings": [
+                {
+                    "localRoot": "${workspaceFolder}/translator",
+                    "remoteRoot": "/app"
+                }
+            ]
+        }
+    ]
+}

Makefile

@@ -22,28 +22,28 @@ compose.override.yml:
 ## behave-all: runs behave inside the containers against all of your features
 .Phony: behave-all
 behave-all: compose.override.yml
-	@docker compose run django coverage run -a manage.py behave --no-input --simple
+	@podman-compose run django coverage run -a manage.py behave --no-input --simple
 
 ## behave: runs behave inside the containers against a specific feature (append FEATURE=feature_name_here)
 .Phony: behave
 behave: compose.override.yml
-	@docker compose run django python manage.py behave --no-input --simple -i $(FEATURE)
+	@podman-compose run django python manage.py behave --no-input --simple -i $(FEATURE)
 
 ## behave-translator
 .Phony: behave-translator
 behave-translator: compose.override.yml
-	@docker compose exec -T translator /usr/local/bin/behave /app/acceptance/features
+	@podman-compose exec -T translator /usr/local/bin/behave /app/acceptance/features
 
 ## build: rebuilds all your containers or a single one if CONTAINER is specified
 .Phony: build
 build: compose.override.yml
-	@docker compose up -d --no-deps --build $(CONTAINER)
-	@docker compose restart $(CONTAINER)
+	@podman-compose up -d --no-deps --build $(CONTAINER)
+	@podman-compose restart $(CONTAINER)
 
 ## coverage.xml: generate coverage from test runs
 coverage.xml: pytest behave-all behave-translator
-	@docker compose run django coverage report
-	@docker compose run django coverage xml
+	@podman-compose run django coverage report
+	@podman-compose run django coverage xml
 
 ## ci-test: runs all tests just like Gitlab CI does
 .Phony: ci-test
@@ -52,18 +52,18 @@ ci-test: | toggle-local build migrate run coverage.xml
 ## clean: remove local containers and volumes
 .Phony: clean
 clean: compose.override.yml
-	@docker compose rm -f -s
-	@docker volume prune -f
+	@podman-compose rm -f -s
+	@podman volume prune -f
 
 ## collect-static: run collect static admin command
 .Phony: collectstatic
 collectstatic: compose.override.yml
-	@docker compose run django python manage.py collectstatic
+	@podman-compose run django python manage.py collectstatic
 
 ## django-addr: get the IP and ephemeral port assigned to docker:8000
 .Phony: django-addr
 django-addr: compose.override.yml
-	@docker compose port django 8000
+	@podman-compose port django 8000
 
 ## django-url: get the URL based on http://$(make django-addr)
 .Phony: django-url
@@ -75,15 +75,15 @@ django-url: compose.override.yml
 django-open: compose.override.yml
 	@open http://$$(make django-addr)
 
-## down: turn down docker compose stack
+## down: turn down podman-compose stack
 .Phony: down
 down: compose.override.yml
-	@docker compose down
+	@podman-compose down
 
 ## exec: executes a given command on a given container (append CONTAINER=container_name_here and COMMAND=command_here)
 .Phony: exec
 exec: compose.override.yml
-	@docker compose exec $(CONTAINER) $(COMMAND)
+	@podman-compose exec $(CONTAINER) $(COMMAND)
 
 # This automatically builds the help target based on commands prepended with a double hashbang
 ## help: print this help output
@@ -95,41 +95,41 @@ help: Makefile
 ## list-routes: list gobgp routes
 .Phony: list-routes
 list-routes: compose.override.yml
-	@docker compose exec gobgp gobgp global rib -a ipv4
-	@docker compose exec gobgp gobgp global rib -a ipv6
+	@podman-compose exec gobgp gobgp global rib -a ipv4
+	@podman-compose exec gobgp gobgp global rib -a ipv6
 
 ## migrate: makemigrations and then migrate
 .Phony: migrate
 migrate: compose.override.yml
-	@docker compose run django python manage.py makemigrations
-	@docker compose run django python manage.py migrate
+	@podman-compose run django python manage.py makemigrations
+	@podman-compose run django python manage.py migrate
 
 ## pass-reset: change admin's password
 .Phony: pass-reset
 pass-reset: compose.override.yml
-	@docker compose run django python manage.py changepassword admin
+	@podman-compose run django python manage.py changepassword admin
 
 ## pytest: runs pytest inside the containers
 .Phony: pytest
 pytest: compose.override.yml
-	@docker compose run django coverage run -m pytest
+	@podman-compose run django coverage run -m pytest
 
 ## run: brings up the containers as described in compose.override.yml
 .Phony: run
 run: compose.override.yml
-	@docker compose up -d
+	@podman-compose up -d
 
 ## stop: turns off running containers
 .Phony: stop
 stop: compose.override.yml
-	@docker compose stop
+	@podman-compose stop
 
 ## tail-log: tail a docker container's logs (append CONTAINER=container_name_here)
 .Phony: tail-log
 tail-log: compose.override.yml
-	@docker compose logs -f $(CONTAINER)
+	@podman-compose logs -f $(CONTAINER)
 
 ## type-check: static type checking
 .Phony: type-check
 type-check: compose.override.yml
-	@docker compose run django mypy scram
+	@podman-compose run django mypy scram