Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove docker boilerplate now provided by common #618

Merged
merged 2 commits into from
Jan 12, 2018
Merged

remove docker boilerplate now provided by common #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8f7bdf
remove docker boilerplate now provided by common
Jan 12, 2018
56e12aa
restore standalone assembly. remove unused ones.
Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ksql-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ ARG DOCKER_REGISTRY

FROM ${DOCKER_REGISTRY}confluentinc/cp-base

ARG KSQL_VERSION
ARG PROJECT_VERSION
ARG ARTIFACT_ID

ADD target/${ARTIFACT_ID}-${KSQL_VERSION}-standalone.jar /usr/share/java/${ARTIFACT_ID}/${ARTIFACT_ID}-${KSQL_VERSION}-standalone.jar
ADD target/${ARTIFACT_ID}-${KSQL_VERSION}-package/bin/* /usr/bin/
ADD target/${ARTIFACT_ID}-${KSQL_VERSION}-package/etc/* /etc/ksql/
ADD target/${ARTIFACT_ID}-${KSQL_VERSION}-package/share/doc/* /usr/share/doc/${ARTIFACT_ID}/
ADD target/${ARTIFACT_ID}-${PROJECT_VERSION}-standalone.jar /usr/share/java/${ARTIFACT_ID}/${ARTIFACT_ID}-${PROJECT_VERSION}-standalone.jar
ADD target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/bin/* /usr/bin/
ADD target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/etc/* /etc/ksql/
ADD target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/share/doc/* /usr/share/doc/${ARTIFACT_ID}/
84 changes: 1 addition & 83 deletions ksql-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<main-class>io.confluent.ksql.Ksql</main-class>
<cli.skip-execute>false</cli.skip-execute>
<cli.main-class>${main-class}</cli.main-class>
<docker.skip-build>false</docker.skip-build>
</properties>

<dependencies>
Expand Down Expand Up @@ -107,8 +108,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/assembly/development.xml</descriptor>
<descriptor>src/assembly/package.xml</descriptor>
<descriptor>src/assembly/standalone.xml</descriptor>
</descriptors>
<archive>
Expand All @@ -130,85 +129,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>packaging</id>
<activation>
<property>
<name>env.BUILD_NUMBER</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>create-licenses</id>
<configuration>
<mainClass>io.confluent.licenses.LicenseFinder</mainClass>
<arguments>
<!-- Note use of development instead of package so we pick up all dependencies.
This assumes both subprojects will be packaged together. -->
<argument>-i ${project.build.directory}/${project.build.finalName}-package/share/java/${project.artifactId}</argument>
<argument>-f</argument>
<argument>-h ${project.build.directory}/${project.build.finalName}-package/share/doc/${project.artifactId}/licenses.html</argument>
<argument>-l ${project.build.directory}/${project.build.finalName}-package/share/doc/${project.artifactId}/licenses</argument>
<argument>-n ${project.build.directory}/${project.build.finalName}-package/share/doc/${project.artifactId}/notices</argument>
<argument>-x licenses-${project.version}.jar</argument>
</arguments>
</configuration>
<phase>package</phase>
<goals>
<goal>java</goal>
</goals>
</execution>
</executions>
<configuration>
<includeProjectDependencies>true</includeProjectDependencies>
<includePluginDependencies>true</includePluginDependencies>
<executableDependency>
<groupId>io.confluent</groupId>
<artifactId>licenses</artifactId>
</executableDependency>
</configuration>
<dependencies>
<dependency>
<groupId>io.confluent</groupId>
<artifactId>licenses</artifactId>
<version>${licenses.version}</version>
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>default</id>
<goals>
<goal>build</goal>
</goals>
<configuration>
<skip>${docker.skip}</skip>
<buildArgs>
<ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
<KSQL_VERSION>${project.version}</KSQL_VERSION>
<DOCKER_REGISTRY>${docker.registry}</DOCKER_REGISTRY>
</buildArgs>
<tag>${docker.tag}</tag>
<repository>${docker.registry}confluentinc/${project.artifactId}</repository>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
51 changes: 0 additions & 51 deletions ksql-cli/src/assembly/development.xml
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions ksql-cli/src/assembly/package.xml
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions ksql-clickstream-demo/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ ARG DOCKER_UPSTREAM_REGISTRY

FROM ${DOCKER_UPSTREAM_REGISTRY}confluentinc/docker-demo-base:3.3.0

ARG KSQL_VERSION
ARG PROJECT_VERSION
ARG ARTIFACT_ID

EXPOSE 3000

ENV ES_JAVA_OPTS="-Xms512M -Xmx512M"
ENV KSQL_CLASSPATH=/usr/share/java/${ARTIFACT_ID}/${ARTIFACT_ID}-${KSQL_VERSION}-standalone.jar
ENV KSQL_CLASSPATH=/usr/share/java/${ARTIFACT_ID}/${ARTIFACT_ID}-${PROJECT_VERSION}-standalone.jar
ENV KSQL_CONFIG_DIR="/etc/ksql"
ENV KSQL_LOG4J_OPTS="-Dlog4j.configuration=file:/etc/ksql/log4j-rolling.properties"

Expand All @@ -21,9 +21,9 @@ RUN wget -q https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana_
&& rm grafana_4.4.3_amd64.deb \
&& rm elasticsearch-5.5.2.deb

ADD target/${ARTIFACT_ID}-${KSQL_VERSION}-standalone.jar /usr/share/java/${ARTIFACT_ID}/${ARTIFACT_ID}-${KSQL_VERSION}-standalone.jar
ADD target/${ARTIFACT_ID}-${KSQL_VERSION}-package/bin/* /usr/bin/
ADD target/${ARTIFACT_ID}-${KSQL_VERSION}-package/etc/* /etc/ksql/
ADD target/${ARTIFACT_ID}-${PROJECT_VERSION}-standalone.jar /usr/share/java/${ARTIFACT_ID}/${ARTIFACT_ID}-${PROJECT_VERSION}-standalone.jar
ADD target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/bin/* /usr/bin/
ADD target/${ARTIFACT_ID}-${PROJECT_VERSION}-package/etc/* /etc/ksql/

ADD demo/*sh /usr/share/doc/ksql-clickstream-demo/
ADD demo/*sql /usr/share/doc/ksql-clickstream-demo/
Expand Down
45 changes: 4 additions & 41 deletions ksql-clickstream-demo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<artifactId>ksql-clickstream-demo</artifactId>
<name>KSQL Clickstream Analysis Demo</name>

<properties>
<docker.skip-build>false</docker.skip-build>
</properties>

<dependencies>
<dependency>
<groupId>io.confluent.ksql</groupId>
Expand Down Expand Up @@ -57,8 +61,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/assembly/development.xml</descriptor>
<descriptor>src/assembly/package.xml</descriptor>
<descriptor>src/assembly/standalone.xml</descriptor>
</descriptors>
<archive>
Expand All @@ -80,43 +82,4 @@
</plugin>
</plugins>
</build>

<profiles>
<profile>
<id>packaging</id>
<activation>
<property>
<name>env.BUILD_NUMBER</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
<version>${dockerfile-maven-plugin.version}</version>
<executions>
<execution>
<id>default</id>
<goals>
<goal>build</goal>
</goals>
<configuration>
<skip>${docker.skip}</skip>
<buildArgs>
<ARTIFACT_ID>${project.artifactId}</ARTIFACT_ID>
<KSQL_VERSION>${project.version}</KSQL_VERSION>
<DOCKER_REGISTRY>${docker.registry}</DOCKER_REGISTRY>
<DOCKER_UPSTREAM_REGISTRY>docker.io/</DOCKER_UPSTREAM_REGISTRY>
</buildArgs>
<tag>${docker.tag}</tag>
<repository>${docker.registry}confluentinc/${project.artifactId}</repository>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
51 changes: 0 additions & 51 deletions ksql-clickstream-demo/src/assembly/development.xml
View file
Open in desktop

This file was deleted.

Loading