diff --git a/app/index.html b/app/index.html
index 0ff4559..8388c4b 100644
--- a/app/index.html
+++ b/app/index.html
@@ -5,12 +5,6 @@
Vite + Vue
-
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 417f3e4..07a1ac2 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -2,6 +2,8 @@ version: '3'
services:
app:
image: lancatlin/linux-odyssey:app
+ depends_on:
+ - backend
build:
context: .
dockerfile: app/Dockerfile
@@ -12,6 +14,8 @@ services:
- 8080:80
backend:
image: lancatlin/linux-odyssey:backend
+ depends_on:
+ - db
restart: on-failure
build:
context: .
@@ -25,7 +29,7 @@ services:
env_file:
- .env
environment:
- - MONGO_URL=mongodb://user:user-password@db:27017/odyssey-test
+ - MONGO_URL=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@db:27017/${MONGO_DB}
- DOCKER_NETWORK=linux-odyssey-players
- SECRET_KEY=${SECRET_KEY}
- TRUSTED_PROXIES=${TRUSTED_PROXIES}
@@ -43,7 +47,7 @@ services:
ports:
- '3001:3001'
environment:
- - MONGO_URL=mongodb://user:user-password@db:27017/odyssey-test
+ - MONGO_URL=mongodb://${MONGO_USER}:${MONGO_PASSWORD}@db:27017/${MONGO_DB}
db:
image: mongo
@@ -58,10 +62,10 @@ services:
environment:
- BASE_URL=${BASE_URL}
- MONGO_INITDB_ROOT_USERNAME=admin
- - MONGO_INITDB_ROOT_PASSWORD=admin-password
- - MONGO_USER=user
- - MONGO_PASS=user-password
- - MONGO_DB=odyssey-test
+ - MONGO_INITDB_ROOT_PASSWORD=${MONGO_ROOT_PASSWORD}
+ - MONGO_USER=${MONGO_USER}
+ - MONGO_PASS=${MONGO_PASSWORD}
+ - MONGO_DB=${MONGO_DB}
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
- GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID}
diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml
index 74abedf..2661ddd 100644
--- a/docker-compose.testing.yml
+++ b/docker-compose.testing.yml
@@ -43,7 +43,6 @@ services:
- MONGO_URL=mongodb://user:user-password@db-test:27017/odyssey-test
- DOCKER_NETWORK=linux-odyssey-players
- SECRET_KEY=b1d2e917-17b9-4fce-9055-082dee6ec5d6 # Only for testing
- - TRUSTED_PROXIES=${TRUSTED_PROXIES}
- GOOGLE_CLIENT_ID=${GOOGLE_CLIENT_ID}
- GOOGLE_CLIENT_SECRET=${GOOGLE_CLIENT_SECRET}
- GITHUB_CLIENT_ID=${GITHUB_CLIENT_ID}
diff --git a/docker-scripts.sh b/docker-scripts.sh
index 2e78861..bb7b24b 100755
--- a/docker-scripts.sh
+++ b/docker-scripts.sh
@@ -19,7 +19,7 @@ clean() {
}
test() {
- if [ "$1" = "--build"]; then
+ if [ "$1" = "--build" ]; then
docker compose -f docker-compose.testing.yml build
fi
docker compose -f docker-compose.testing.yml run --rm cypress
diff --git a/server/Dockerfile b/server/Dockerfile
index 62f6159..dc82a75 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -2,11 +2,11 @@ FROM node:20-alpine AS build
WORKDIR /app
COPY ./package.json yarn.lock ./
-COPY server/package.json ./server/package.json
COPY packages/file-graph/package.json ./packages/file-graph/package.json
COPY packages/utils/package.json ./packages/utils/package.json
COPY packages/models/package.json ./packages/models/package.json
COPY packages/constants/package.json ./packages/constants/package.json
+COPY server/package.json ./server/package.json
RUN yarn install --frozen-lockfile --production
# Install docker cli
COPY --from=docker:dind /usr/local/bin/docker /usr/local/bin/
diff --git a/tests/cypress/e2e/helloworld.cy.js b/tests/cypress/e2e/helloworld.cy.js
index b772b68..97cffef 100644
--- a/tests/cypress/e2e/helloworld.cy.js
+++ b/tests/cypress/e2e/helloworld.cy.js
@@ -1,11 +1,10 @@
///
describe('example helloworld app', () => {
- beforeEach(() => {
- cy.visit('/')
- })
-
it('open login page', () => {
+ console.log('baseUrl', Cypress.config('baseUrl'))
+ cy.visit('/register')
cy.get('#username').type('alex')
- cy.get('#password').type('123456{enter}')
+ cy.get('#email').type('alex@gmail.com')
+ cy.get('#password').type('123456As{enter}')
})
})