From 172d3891f05e0995acb4ea6ccc72310ed55c7f76 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Tue, 21 Apr 2020 15:16:42 +0200
Subject: [PATCH] switched port to test with Travis
---
Dockerfile | 2 +-
angular.json | 2 +-
docker/docker-compose.yml | 6 +++---
e2e/protractor.conf.js | 2 +-
server.ts | 2 +-
src/environments/environment.common.ts | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index db9983cace..9bda529ddf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
FROM node:12-alpine
WORKDIR /app
ADD . /app/
-EXPOSE 4000
+EXPOSE 3000
# We run yarn install with an increased network timeout (5min) to avoid "ESOCKETTIMEDOUT" errors from hub.docker.com
# See, for example https://github.com/yarnpkg/yarn/issues/5540
diff --git a/angular.json b/angular.json
index b3fbd82f02..b63d82fd4b 100644
--- a/angular.json
+++ b/angular.json
@@ -66,7 +66,7 @@
"builder": "@angular-builders/custom-webpack:dev-server",
"options": {
"browserTarget": "dspace-angular-cli:build",
- "port": 4000
+ "port": 3000
},
"configurations": {
"production": {
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 87f2fe0a5c..23f0615a1f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -7,7 +7,7 @@ services:
environment:
DSPACE_HOST: dspace-angular
DSPACE_NAMESPACE: /
- DSPACE_PORT: '4000'
+ DSPACE_PORT: '3000'
DSPACE_SSL: "false"
image: dspace/dspace-angular:latest
build:
@@ -16,8 +16,8 @@ services:
networks:
dspacenet:
ports:
- - published: 4000
- target: 4000
+ - published: 3000
+ target: 3000
- published: 9876
target: 9876
stdin_open: true
diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js
index 51180c8044..2432b98909 100644
--- a/e2e/protractor.conf.js
+++ b/e2e/protractor.conf.js
@@ -12,7 +12,7 @@ exports.config = {
// Change to 'false' to run tests using a remote Selenium server
directConnect: true,
// Change if the website to test is not on the localhost
- baseUrl: 'http://localhost:4000/',
+ baseUrl: 'http://localhost:3000/',
// -----------------------------------------------------------------
specs: [
'./src/**/*.e2e-spec.ts'
diff --git a/server.ts b/server.ts
index ffa528ea3e..442bb19885 100644
--- a/server.ts
+++ b/server.ts
@@ -27,7 +27,7 @@ import * as cookieParser from 'cookie-parser';
// Express server
const app = express();
-const PORT = process.env.PORT || 4000;
+const PORT = process.env.PORT || 3000;
const DIST_FOLDER = join(process.cwd(), 'dist/browser');
// * NOTE :: leave this as require() since this file is built Dynamically from webpack
diff --git a/src/environments/environment.common.ts b/src/environments/environment.common.ts
index 9dcac65363..62b988e0fc 100644
--- a/src/environments/environment.common.ts
+++ b/src/environments/environment.common.ts
@@ -9,7 +9,7 @@ export const environment: GlobalConfig = {
ui: {
ssl: false,
host: 'localhost',
- port: 4000,
+ port: 3000,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace: '/',
},
--
GitLab