Fix Docker tests and CI

botfactoryit · Apr 14, 2024 · f36f29b · f36f29b
1 parent 1eee90c
commit f36f29b
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 19 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,8 +15,12 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+    - name: Debug
+      run: |
+        ls -lah
+        ls -lah test
     - name: Run tests
-      run: docker-compose -f docker-compose.tests.yml up --build
+      run: docker compose -f docker-compose.tests.yml up --build --abort-on-container-exit --exit-code-from tests
 
   docker:
     name: Docker build

diff --git a/.gitignore b/.gitignore
@@ -176,7 +176,7 @@ $RECYCLE.BIN/
 
 .idea
 
-config.json
+/config.json
 
 maps/tmp/cards/
 maps/tmp/maps/

diff --git a/Dockerfile.Dev b/Dockerfile.Dev
@@ -1,5 +1,4 @@
 FROM public.ecr.aws/m8i2k7g9/docker-for-terremotibot:16.13.1
-LABEL mantainer Matteo Contrini <matteo@contrini.it>
 
 # Move to /src
 WORKDIR /src

diff --git a/Dockerfile.Prod b/Dockerfile.Prod
@@ -1,5 +1,4 @@
 FROM public.ecr.aws/m8i2k7g9/docker-for-terremotibot:16.13.1
-LABEL mantainer Francesco Tonini <francesco@tonini.dev>
 ENV NODE_ENV=production
 
 # Move to /src

diff --git a/Dockerfile.Tests b/Dockerfile.Tests
@@ -1,5 +1,4 @@
 FROM public.ecr.aws/m8i2k7g9/docker-for-terremotibot:16.13.1
-LABEL mantainer Matteo Contrini <matteo@contrini.it>
 
 # Move to /src folder
 WORKDIR /src

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ A `config.json` file should be placed in the `config` directory. The template fo
 
 ## How to run it
 
-```js
+```sh
 npm ci
 npm run dev
 ```
@@ -58,8 +58,8 @@ docker compose -f docker-compose.dev.yml up --build bot
 
 ## Run tests with Docker
 
-You can run tests locally with Docker. This brings up a MongoDB instance used for runnig tests. After they are completed, stop Compose pressing CTRL+C (once).
+You can run tests locally with Docker. This brings up a MongoDB instance used for running tests. After they are completed, stop Compose pressing CTRL+C (once).
 
 ```sh
-docker-compose -f docker-compose.tests.yml up --build
+docker compose -f docker-compose.tests.yml up --build
 ```
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -1,8 +1,5 @@
-version: '3'
-
 services:
   bot:
-    container_name: bot
     build:
       context: .
       dockerfile: Dockerfile.Dev
@@ -12,8 +9,7 @@ services:
       - ./lib/config/config.json:/src/lib/config/config.json
       - ./tmp:/tmp
   mongo:
-    container_name: mongo
-    image: mongo:4.0.6
+    image: mongo:4.2.2
     ports:
       - "28000:27017"
     logging:

diff --git a/docker-compose.tests.yml b/docker-compose.tests.yml
@@ -1,8 +1,5 @@
-version: '3'
-
 services:
-  bot:
-    container_name: tests
+  tests:
     build:
       context: .
       dockerfile: Dockerfile.Tests
@@ -11,8 +8,7 @@ services:
     volumes:
       - ./test/config.json:/src/lib/config/config.json
   mongo:
-    container_name: mongo
-    image: mongo:4.2
+    image: mongo:4.2.2
     expose:
       - "27017"
     logging:

diff --git a/test/config.json b/test/config.json
@@ -0,0 +1,39 @@
+{
+    "telegram": {
+        "token": "",
+        "serverPort": 4050
+    },
+    "botan": {
+        "token": ""
+    },
+    "db": {
+        "connectionString": "mongo/terretest"
+    },
+    "ingv": {
+        "pollingInterval": 60000,
+        "broadcastThreshold": 5
+    },
+    "social": {
+        "enabled": false,
+        "threshold": 3,
+        "facebook": {
+            "accessToken": "",
+            "pageId": ""
+        },
+        "twitter": {
+            "consumerKey": "",
+            "consumerSecret": "",
+            "accessToken": "",
+            "accessTokenSecret": ""
+        }
+    },
+    "geonames": {
+        "username": "demo"
+    },
+    "mapbox": {
+        "token": "demo"
+    },
+    "stathat": {
+        "key": ""
+    }
+}