tests: Respond to review on test docker setup

flatpak · Jun 28, 2022 · 8629bed · 8629bed
1 parent a796aff
commit 8629bed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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"
 }