Removed redundant code, small reformatting.

eventuate-tram · May 22, 2020 · 07ca0ac · 07ca0ac
1 parent 225bd69
commit 07ca0ac
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/docker-compose-java-development.yml b/docker-compose-java-development.yml
@@ -5,14 +5,4 @@ services:
     image: eventuateio/eventuate-tram-sagas-examples-customers-and-orders-java-development:latest
     volumes:
       - .:/eventuate-tram-sagas-examples-customers-and-orders-java-development
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      SPRING_DATASOURCE_URL: jdbc:mysql://mysql/eventuate
-      SPRING_DATASOURCE_USERNAME: mysqluser
-      SPRING_DATASOURCE_PASSWORD: mysqlpw
-      SPRING_DATASOURCE_DRIVER_CLASS_NAME: com.mysql.jdbc.Driver
-      EVENTUATELOCAL_KAFKA_BOOTSTRAP_SERVERS: kafka:29092
-      EVENTUATELOCAL_ZOOKEEPER_CONNECTION_STRING: zookeeper:2181
-      SPRING_SLEUTH_ENABLED: "true"
-      SPRING_SLEUTH_SAMPLER_PROBABILITY: 1
-      SPRING_ZIPKIN_BASE_URL: http://zipkin:9411/
+      - /var/run/docker.sock:/var/run/docker.sock
diff --git a/java-development/Dockerfile b/java-development/Dockerfile
@@ -1,6 +1,5 @@
 FROM openjdk:8u252-slim-buster
 
-WORKDIR /eventuate-tram-sagas-examples-customers-and-orders-java-development
 RUN apt-get update && \
     apt-get install -y curl && \
     apt-get install -y jq && \
@@ -21,8 +20,10 @@ RUN apt-get update && \
   chmod +x /usr/local/bin/docker-compose && \
   rm -rf /var/lib/apt/lists/*
 
+WORKDIR /eventuate-tram-sagas-examples-customers-and-orders-java-development
+CMD echo Ready ; sleep 260000
+
 COPY build /tmp-src
 
 RUN echo "Building in image..." && (cd /tmp-src ; ./gradlew testClasses assemble ; cd ; rm -fr /tmp-src)
 
-CMD echo Ready ; sleep 260000
diff --git a/prepare-java-development-docker-image.sh b/prepare-java-development-docker-image.sh
@@ -4,7 +4,6 @@ TARGET=java-development/build
 rm -fr ${TARGET}
 mkdir ${TARGET}
 
-#tar -cf - *gradle* */src/* */build.gradle | tar -C ${TARGET} -xf -
 tar -cf - *gradle* */build.gradle buildSrc | tar -C ${TARGET} -xf -
 
 for main in $(find */src -name *Main.java) ; do

diff --git a/publish-docker-images.sh b/publish-docker-images.sh
@@ -6,8 +6,6 @@ export DOCKER_IMAGE_TAG=latest
 
 docker login -u ${DOCKER_USER_ID?} -p ${DOCKER_PASSWORD?}
 
-./gradlew assemble mysqlComposeBuild mysqlComposePush
-
 ./gradlew javaDevelopmentComposePull || echo no image to pull
 
 ./gradlew javaDevelopmentImageComposeBuild