hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

switched port to test with Travis

Browse Source
This commit is contained in:
lotte
2020-04-21 15:16:42 +02:00
parent cad9dcaf98
commit 172d3891f0
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -4,7 +4,7 @@
FROM node:12-alpine FROM node:12-alpine
WORKDIR /app WORKDIR /app
ADD . /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 # 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 # See, for example https://github.com/yarnpkg/yarn/issues/5540

2
angular.json
View File

@@ -66,7 +66,7 @@
"builder": "@angular-builders/custom-webpack:dev-server", "builder": "@angular-builders/custom-webpack:dev-server",
"options": { "options": {
"browserTarget": "dspace-angular-cli:build", "browserTarget": "dspace-angular-cli:build",
"port": 4000 "port": 3000
}, },
"configurations": { "configurations": {
"production": { "production": {

6
docker/docker-compose.yml
View File

@@ -7,7 +7,7 @@ services:
environment: environment:
DSPACE_HOST: dspace-angular DSPACE_HOST: dspace-angular
DSPACE_NAMESPACE: / DSPACE_NAMESPACE: /
DSPACE_PORT: '4000' DSPACE_PORT: '3000'
DSPACE_SSL: "false" DSPACE_SSL: "false"
image: dspace/dspace-angular:latest image: dspace/dspace-angular:latest
build: build:
@@ -16,8 +16,8 @@ services:
networks: networks:
dspacenet: dspacenet:
ports: ports:
- published: 4000 - published: 3000
target: 4000 target: 3000
- published: 9876 - published: 9876
target: 9876 target: 9876
stdin_open: true stdin_open: true

2
e2e/protractor.conf.js
View File

@@ -12,7 +12,7 @@ exports.config = {
// Change to 'false' to run tests using a remote Selenium server // Change to 'false' to run tests using a remote Selenium server
directConnect: true, directConnect: true,
// Change if the website to test is not on the localhost // Change if the website to test is not on the localhost
baseUrl: 'http://localhost:4000/', baseUrl: 'http://localhost:3000/',
// ----------------------------------------------------------------- // -----------------------------------------------------------------
specs: [ specs: [
'./src/**/*.e2e-spec.ts' './src/**/*.e2e-spec.ts'

2
server.ts
View File

@@ -27,7 +27,7 @@ import * as cookieParser from 'cookie-parser';
// Express server // Express server
const app = express(); const app = express();
const PORT = process.env.PORT || 4000; const PORT = process.env.PORT || 3000;
const DIST_FOLDER = join(process.cwd(), 'dist/browser'); const DIST_FOLDER = join(process.cwd(), 'dist/browser');
// * NOTE :: leave this as require() since this file is built Dynamically from webpack // * NOTE :: leave this as require() since this file is built Dynamically from webpack

2
src/environments/environment.common.ts
View File

@@ -9,7 +9,7 @@ export const environment: GlobalConfig = {
ui: { ui: {
ssl: false, ssl: false,
host: 'localhost', host: 'localhost',
port: 4000, port: 3000,
// NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
nameSpace: '/', nameSpace: '/',
}, },