GKernelCI · aliceinwire · Dec 13, 2022 · Dec 13, 2022
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1 @@
-/.blackbox/pubring.gpg~
-/.blackbox/pubring.kbx~
-/.blackbox/secring.gpg
-/secrets.yml
-/docker-compose.yml
+gkci-settings.toml
diff --git a/main.py b/main.py
diff --git a/requirements.txt b/requirements.txt
@@ -1 +1,3 @@
 pyyaml
+toml
+jinja2
diff --git a/update-images.sh → scripts/update-images.sh b/update-images.sh → scripts/update-images.sh
@@ -4,4 +4,4 @@ docker pull buildbot/buildbot-worker:master
 docker pull nginxproxy/nginx-proxy:alpine
 docker pull ubuntu:bionic
 docker pull nginx:stable-alpine
-docker-compose pull --include-deps
+docker-compose -f ../docker-compose.yml pull --include-deps
diff --git a/secrets.yml.example b/secrets.yml.example
diff --git a/kernelci-ci-gkernelci.json.example → settings/kernelci-ci-gkernelci.json.example b/kernelci-ci-gkernelci.json.example → settings/kernelci-ci-gkernelci.json.example
diff --git a/sparser.py b/sparser.py
diff --git a/start_testing.sh b/start_testing.sh
diff --git a/docker-compose.letsencrypt.yml → templates/docker/letsencrypt.yml b/docker-compose.letsencrypt.yml → templates/docker/letsencrypt.yml
diff --git a/docker-compose.yml.template → templates/docker/main.yml b/docker-compose.yml.template → templates/docker/main.yml
-Original file line number
+Diff line change
@@ -1 +1,3 @@
     pyyaml
+    toml
+    jinja2