Merge remote-tracking branch 'upstream/master' into craedel-enterprise-patterns/front-controller

2016-09-25 11:13:33 +02:00
parent 51c438b469 5b29f1bc81
commit 3b948c9b8b
239 changed files with 6802 additions and 3209 deletions
@@ -1,4 +0,0 @@
-FROM alpine:edge
-MAINTAINER baeldung.com
-RUN apk add --no-cache openjdk8
-COPY files/UnlimitedJCEPolicyJDK8/* /usr/lib/jvm/java-1.8-openjdk/jre/lib/security/
@@ -1,41 +0,0 @@
-version: '2'
-services:
-    config-server:
-        build:
-            context: .
-            dockerfile: Dockerfile.server
-        image: config-server:latest
-        expose:
-            - 8888
-        networks:
-            - spring-cloud-network
-        volumes:
-            - spring-cloud-config-repo:/var/lib/spring-cloud/config-repo
-        logging:
-            driver: json-file
-    config-client:
-        build:
-            context: .
-            dockerfile: Dockerfile.client
-        image: config-client:latest
-        entrypoint: /opt/spring-cloud/bin/config-client-entrypoint.sh
-        environment:
-            SPRING_APPLICATION_JSON: '{"spring": {"cloud": {"config": {"uri": "http://config-server:8888"}}}}'
-        expose:
-            - 8080
-        ports:
-            - 8080
-        networks:
-            - spring-cloud-network
-        links:
-            - config-server:config-server
-        depends_on:
-            - config-server
-        logging:
-            driver: json-file
-networks:
-    spring-cloud-network:
-        driver: bridge
-volumes:
-    spring-cloud-config-repo:
-        external: true
@@ -1,43 +0,0 @@
-version: '2'
-services:
-    config-server:
-        container_name: config-server
-        build:
-            context: .
-            dockerfile: Dockerfile.server
-        image: config-server:latest
-        expose:
-            - 8888
-        networks:
-            - spring-cloud-network
-        volumes:
-            - spring-cloud-config-repo:/var/lib/spring-cloud/config-repo
-        logging:
-            driver: json-file
-    config-client:
-        container_name: config-client
-        build:
-            context: .
-            dockerfile: Dockerfile.client
-        image: config-client:latest
-        entrypoint: /opt/spring-cloud/bin/config-client-entrypoint.sh
-        environment:
-            SPRING_APPLICATION_JSON: '{"spring": {"cloud": {"config": {"uri": "http://config-server:8888"}}}}'
-        expose:
-            - 8080
-        ports:
-            - 8080:8080
-        networks:
-            - spring-cloud-network
-        links:
-            - config-server:config-server
-        depends_on:
-            - config-server
-        logging:
-            driver: json-file
-networks:
-    spring-cloud-network:
-        driver: bridge
-volumes:
-    spring-cloud-config-repo:
-        external: true