Merge branch 'proxy' into aims

.env

@@ -0,0 +1,4 @@
+PROXY_PROTOCOL=http
+PROXY_HOST=localhost
+PROXY_PORT=8080
+IDENTITY_SERVICE_BASEURL=http://auth.example.org:8080

docker-compose.yml

@@ -4,35 +4,27 @@
 version: "2"
 
 services:
-    transform-router:
-        image: quay.io/alfresco/alfresco-transform-router:latest
-        environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
-            CORE_AIO_URL : "http://transform-core-aio:8090"
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
-        depends_on:
-            - activemq
-            - shared-file-store
 
-    transform-core-aio:
+    identity:
-        image: alfresco/alfresco-transform-core-aio:latest
+        image: alfresco/alfresco-identity-service:1.3
+        user: jboss
         environment:
-            ACTIVEMQ_URL: "nio://activemq:61616"
+            KEYCLOAK_USER: admin
-            FILE_STORE_URL: "http://shared-file-store:8099/alfresco/api/-default-/private/sfs/versions/1/file"
+            KEYCLOAK_PASSWORD: admin
-        depends_on:
+            KEYCLOAK_HOSTNAME: auth.example.org
-            - activemq
+            KEYCLOAK_IMPORT: /tmp/keycloak-alfresco-realm.json
-            - shared-file-store
+            KEYCLOAK_STATISTICS: enabled
-
+        networks:
-    shared-file-store:
+            default:
-        image: alfresco/alfresco-shared-file-store:latest
+                aliases:
+                    - "auth.example.org"
         volumes:
-            - shared-file-store-volume:/tmp/Alfresco/sfs
+            - ./keycloak-alfresco-realm.json:/tmp/keycloak-alfresco-realm.json:ro
     
-    activemq:
+    proxy:
-        image: alfresco/alfresco-activemq:latest
+        build: ./nginx-ingress
-
+        image: local/nginx-ingress:aims
-volumes:
+        ports:
-    shared-file-store-volume:
+            - 8080:8080
-        driver_opts:
+        depends_on:
-            type: tmpfs
+            - identity
-            device: tmpfs

keycloak-alfresco-realm.json

@@ -0,0 +1,47 @@
+{
+  "realm": "alfresco",
+  "enabled": true,
+  "sslRequired": "external",
+  "registrationAllowed": false,
+  "roles": {
+    "realm": [ {
+      "name": "user",
+      "description": "User privileges"
+    }, {
+      "name": "admin",
+      "description": "Administrator privileges"
+    } ]
+  },
+  "clients": [
+    {
+      "clientId": "alfresco",
+      "name": "Alfresco Products",
+      "enabled": true,
+      "alwaysDisplayInConsole": false,
+      "redirectUris": [ "*" ],
+      "standardFlowEnabled": true,
+      "implicitFlowEnabled": true,
+      "directAccessGrantsEnabled": false,
+      "publicClient": true,
+      "protocol": "openid-connect",
+      "attributes": {
+        "login_theme": "alfresco"
+      }
+    }
+  ],
+  "requiredCredentials": [ "password" ],
+  "users": [
+    {
+      "username": "admin",
+      "email": "admin@app.activiti.com",
+      "enabled": true,
+      "credentials" : [
+        {
+          "type" : "password",
+          "value" : "admin"
+        }
+      ],
+      "realmRoles": [ "user", "admin" ]
+    }
+  ]
+}

nginx-ingress/Dockerfile

@@ -0,0 +1,8 @@
+FROM nginx:stable-alpine
+
+COPY nginx.conf /etc/nginx/nginx.conf
+
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+
+ENTRYPOINT [ "/entrypoint.sh" ]

nginx-ingress/entrypoint.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [[ $AIMS_URL ]]; then
+  sed -i s%http:\/\/identity:8080%"$AIMS_URL"%g /etc/nginx/nginx.conf
+fi
+
+if [[ $ACCESS_LOG ]]; then
+  sed -i s%\#ENV_ACCESS_LOG%"access_log $ACCESS_LOG;"%g /etc/nginx/nginx.conf
+fi
+
+nginx -g "daemon off;"

nginx-ingress/nginx.conf

@@ -0,0 +1,43 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    server {
+        listen *:8080;
+
+        client_max_body_size 0;
+
+        set  $allowOriginSite *;
+        proxy_pass_request_headers on;
+        proxy_pass_header Set-Cookie;
+
+        # External settings, do not remove
+        #ENV_ACCESS_LOG
+
+        proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;
+        proxy_redirect off;
+#        proxy_buffering off;
+        proxy_buffer_size	64k;
+        proxy_buffers		4 256k;
+        proxy_busy_buffers_size	256k;
+        proxy_set_header Host              $http_host;
+        proxy_set_header X-Real-IP         $remote_addr;
+        proxy_set_header X-Forwarded-For   $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_pass_header Set-Cookie;
+
+        location / {
+            return 301 $scheme://$http_host/auth;
+        }
+
+        location /auth/ {
+            proxy_pass http://identity:8080;
+
+            # If using external proxy / load balancer (for initial redirect if no trailing slash)
+            absolute_redirect off;
+        }
+    }
+}