Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 6 additions & 1 deletion serve.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
13 changes: 0 additions & 13 deletions tests.Dockerfile

This file was deleted.