From 8629bed293a8dbfc693255fbed3a4502d5e97f67 Mon Sep 17 00:00:00 2001
From: James Westman <james@jwestman.net>
Date: Fri, 24 Jun 2022 14:32:25 -0500
Subject: [PATCH] tests: Respond to review on test docker setup

---
 .github/workflows/ci.yml | 5 +++--
 tests/Dockerfile         | 2 +-
 tests/config.json        | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 14fac05..5b76c73 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,13 +39,14 @@ jobs:
 
      - name: Start containers
        working-directory: ./tests
-       run: docker-compose up -d
+       run: docker compose up -d
 
      - name: Wait for the containers to finish loading
        run: sleep 10
 
      - name: Run test
-       run: docker exec flat-manager ./tests/run-test.py
+       working-directory: ./tests
+       run: docker compose exec flat-manager ./tests/run-test.py
 
   fmt:
     name: Rustfmt
diff --git a/tests/Dockerfile b/tests/Dockerfile
index 23c847e..cc6b310 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:latest
+FROM rust:1.61-bullseye
 
 # Install run-tests.py's dependencies
 RUN apt-get update
diff --git a/tests/config.json b/tests/config.json
index bc3224a..e338c18 100644
--- a/tests/config.json
+++ b/tests/config.json
@@ -25,6 +25,6 @@
     "build-repo-base": "build-repo",
     "build-gpg-key": null,
     "gpg-homedir": null,
-    "secret": "c2VjcmV0Cg==",
-    "repo-secret": "c2VjcmV0Cg=="
+    "secret": "c2VjcmV0",
+    "repo-secret": "c2VjcmV0"
 }