deprecate tomcat builds (#1437)

build-tomcat-e2e.sh

@@ -1,13 +0,0 @@
-npm run build.e2e -- --base-href ./
-
-node -e "
-const fs = require('fs');
-const config = require('./dist/app/app.config.json');
-config.baseShareUrl = 'http://localhost:8080/content-app/#/preview/s/';
-fs.writeFileSync(
-  './dist/app/app.config.json',
-  JSON.stringify(config, null, 2)
-);
-"
-
-jar -cvf docker/tomcat/artifacts/content-app.war -C dist/app/ .

docker/tomcat/Dockerfile

@@ -1,5 +0,0 @@
-FROM tomcat:8.5-alpine
-LABEL version="1.3"
-LABEL maintainer="Denys Vuika <denys.vuika@alfresco.com>"
-
-COPY ./artifacts/content-app.war /usr/local/tomcat/webapps/content-app.war

docker/tomcat/artifacts/.gitignore

@@ -1 +0,0 @@
-*.war

docker/tomcat/docker-compose.yml

@@ -1,97 +0,0 @@
-version: '3'
-
-services:
-  alfresco:
-    image: alfresco/alfresco-content-repository-community:6.1.0-ea
-    depends_on:
-      - postgres
-    environment:
-      JAVA_OPTS: '
-        -Ddb.driver=org.postgresql.Driver
-        -Ddb.username=alfresco
-        -Ddb.password=alfresco
-        -Ddb.url=jdbc:postgresql://postgres:5432/alfresco
-        -Dsolr.host=solr6
-        -Dsolr.port=8983
-        -Dsolr.secureComms=none
-        -Dsolr.base.url=/solr
-        -Dindex.subsystem.name=solr6
-        -Dshare.host=localhost
-        -Ddeployment.method=DOCKER_COMPOSE
-        -Dcsrf.filter.enabled=false
-        '
-    networks:
-      - internal
-    ports:
-      - 8080:8080 #Browser port
-
-  share:
-    image: alfresco/alfresco-share:6.0.c
-    depends_on:
-      - alfresco
-    environment:
-      - REPO_HOST=alfresco
-      - REPO_PORT=8080
-    networks:
-      - internal
-    ports:
-      - 8083:8080
-
-  postgres:
-    image: postgres:10.1
-    environment:
-      - POSTGRES_PASSWORD=alfresco
-      - POSTGRES_USER=alfresco
-      - POSTGRES_DB=alfresco
-    command: postgres -c max_connections=300 -c log_min_messages=LOG
-    networks:
-      - internal
-    ports:
-      - 5432:5432
-
-  solr6:
-    image: alfresco/alfresco-search-services:1.2.0
-    depends_on:
-      - alfresco
-    environment:
-      #Solr needs to know how to register itself with Alfresco
-      - SOLR_ALFRESCO_HOST=alfresco
-      - SOLR_ALFRESCO_PORT=8080
-      #Alfresco needs to know how to call solr
-      - SOLR_SOLR_HOST=solr6
-      - SOLR_SOLR_PORT=8983
-      #Create the default alfresco and archive cores
-      - SOLR_CREATE_ALFRESCO_DEFAULTS=alfresco,archive
-    networks:
-      - internal
-    ports:
-      - 8983:8983 #Browser port
-
-  content-app:
-    image: alfresco/alfresco-content-app:development-latest-tomcat8
-    build: .
-    environment:
-      - APP_BASE_SHARE_URL={protocol}//{hostname}{:port}/content-app/
-    depends_on:
-      - alfresco
-    networks:
-      - internal
-    ports:
-      - 4001:8080
-    # volumes:
-    #     - ./app.config.json:/usr/share/nginx/html/app.config.json
-    #     - ./nginx.conf:/etc/nginx/conf.d/default.conf
-
-  proxy:
-    image: nginx
-    depends_on:
-      - content-app
-    volumes:
-      - ./nginx.conf:/etc/nginx/conf.d/default.conf
-    networks:
-      - internal
-    ports:
-      - 8080:80
-
-networks:
-  internal:

docker/tomcat/nginx.conf

@@ -1,43 +0,0 @@
-server {
-    listen *:80;
-
-    set  $allowOriginSite *;
-    proxy_pass_request_headers on;
-    proxy_pass_header Set-Cookie;
-
-    location / {
-        proxy_pass http://content-app:8080;
-
-        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
-        proxy_redirect off;
-        proxy_buffering off;
-        proxy_set_header Host            $host;
-        proxy_set_header X-Real-IP       $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass_header Set-Cookie;
-    }
-
-    location /alfresco/ {
-        proxy_pass http://alfresco:8080;
-
-        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
-        proxy_redirect off;
-        proxy_buffering off;
-        proxy_set_header Host            $host;
-        proxy_set_header X-Real-IP       $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass_header Set-Cookie;
-    }
-
-    location /share/ {
-        proxy_pass http://share:8080;
-
-        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
-        proxy_redirect off;
-        proxy_buffering off;
-        proxy_set_header Host            $host;
-        proxy_set_header X-Real-IP       $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        proxy_pass_header Set-Cookie;
-    }
-}

package.json

@@ -28,12 +28,6 @@
     "e2e:docker": "./start.sh && npm run e2e && ./start.sh -d",
     "spellcheck": "cspell '{src,e2e,projects}/**/*.ts'",
     "inspect.bundle": "ng build app --prod --stats-json && npx webpack-bundle-analyzer dist/app/stats.json",
-    "build.tomcat": "npm run validate-config && npm run build.extensions && npm run build.app -- --prod --base-href ./ && jar -cvf docker/tomcat/artifacts/content-app.war -C dist/app/ .",
-    "build.tomcat.e2e": "./build-tomcat-e2e.sh",
-    "e2e.tomcat": "protractor --baseUrl=http://localhost:8080/content-app/ $SUITE",
-    "docker.tomcat.start": "cd docker/tomcat && docker-compose up -d --build && npm run wait:app",
-    "docker.tomcat.stop": "cd docker/tomcat && docker-compose stop",
-    "docker.tomcat.e2e": "npm run docker.tomcat.start && npm run e2e.tomcat",
     "validate-config": "ajv validate -s ./node_modules/@alfresco/adf-core/app.config.schema.json -d ./src/app.config.json --errors=text --verbose"
   },
   "private": true,