From fde3b516d69498e8f90252eb8f3cf735c225672c Mon Sep 17 00:00:00 2001 From: Dave Gordon <helloitsdave@gmail.com> Date: Mon, 3 Jun 2024 18:08:12 +0100 Subject: [PATCH] [be] chore: Update to use yarn --- .github/workflows/backend-e2e-tests.yml | 12 +++++++----- backend/Dockerfile | 2 +- backend/docker-compose.yml | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/backend-e2e-tests.yml b/.github/workflows/backend-e2e-tests.yml index 2c60d58e..60253e8e 100644 --- a/.github/workflows/backend-e2e-tests.yml +++ b/.github/workflows/backend-e2e-tests.yml @@ -20,18 +20,20 @@ jobs: env: API_URL: http://localhost:5000 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - - name: Use Node.js 18.x - uses: actions/setup-node@v3 + - name: Use Node.js 20.x + uses: actions/setup-node@v4 with: - node-version: 18.x + node-version: 20.x - name: Create .env file - run: echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" > .env + run: | + echo "JWT_SECRET=${{ secrets.JWT_SECRET }}" > .env + echo "DATABASE_URL=${{ secrets.DATABASE_URL }}" >> .env - name: Start service in docker run: | diff --git a/backend/Dockerfile b/backend/Dockerfile index a5f734af..c32e15ca 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,5 +1,5 @@ # Use an official Node.js runtime based on Alpine Linux as the base image -FROM node:18-alpine +FROM node:20-alpine # Install bash RUN apk add --no-cache bash diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml index 528f5444..42901938 100644 --- a/backend/docker-compose.yml +++ b/backend/docker-compose.yml @@ -7,6 +7,7 @@ services: POSTGRES_USER: test POSTGRES_PASSWORD: test POSTGRES_DB: test + DATABASE_URL: "postgresql://test:test@postgres:5432/test" env_file: - .env ports: