Merge pull request #232 from orionrobots/copilot/fix-231

Fix BDD test dockerfile to use correct Node version - consolidate into serve.Dockerfile

Author: dannystaple

docker-compose.yml

@@ -122,10 +122,11 @@ services:
   test:
     build:
       context: .
-      dockerfile: tests.Dockerfile
+      dockerfile: serve.Dockerfile
+      target: tests
     volumes:
-      - ./tests:/app/tests
-      - ./package.json:/app/package.json
-      - ./package-lock.json:/app/package-lock.json
+      - ./tests:/app/src/tests
+      - ./package.json:/app/src/package.json
+      - ./package-lock.json:/app/src/package-lock.json
     profiles:
       - manual

serve.Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /app/src
 
 # Install dependencies
 COPY package.json package-lock.json ./
-RUN npm install
+RUN npm ci
 
 # Copy rest of the app source
 COPY . /app/src
@@ -27,4 +27,9 @@ RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
 # COPY _site /var/www/html/
 COPY .github/scripts/staging/default.conf /usr/local/apache2/conf/httpd.conf
 
+FROM base AS tests
+
+# Set default command to run BDD tests
+CMD ["npm", "run", "test:bdd"]
+
 FROM base