fix(build): fix docker image build due to project renaming

streamthoughts · Oct 29, 2021 · 0874299 · 0874299
1 parent ca8355f
commit 0874299
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,34 +16,34 @@
 # limitations under the License.
 FROM alpine:latest
 
-ARG kafkaSpecsVersion
+ARG jikkouVersion
 
-ENV KAFKA_SPECS_VERSION="${kafkaSpecsVersion}"
+ENV JIKKOU_VERSION="${jikkouVersion}"
 
 RUN apk update && apk --no-cache add unzip
 
-COPY ./build/distributions/kafka-specs-${KAFKA_SPECS_VERSION}.zip kafka-specs-${KAFKA_SPECS_VERSION}.zip
-RUN unzip kafka-specs-${KAFKA_SPECS_VERSION}.zip && mv kafka-specs-${KAFKA_SPECS_VERSION} kafka-specs
+COPY ./build/distributions/jikkou-${JIKKOU_VERSION}.zip jikkou-${JIKKOU_VERSION}.zip
+RUN unzip jikkou-${JIKKOU_VERSION}.zip && mv jikkou-${JIKKOU_VERSION} jikkou
 
 FROM azul/zulu-openjdk:13
 
-ARG kafkaSpecsVersion
-ARG kafkaSpecsBranch
-ARG kafkaSpecsCommit
+ARG jikkouVersion
+ARG jikkouBranch
+ARG jikkouCommit
 
-ENV KAFKA_SPECS_VERSION="${kafkaSpecsVersion}" \
-    KAFKA_SPECS_COMMIT="${kafkaSpecsCommit}" \
-    KAFKA_SPECS_BRANCH="${kafkaSpecsBranch}"
+ENV JIKKOU_VERSION="${jikkouVersion}" \
+    JIKKOU_COMMIT="${jikkouCommit}" \
+    JIKKOU_BRANCH="${jikkouBranch}"
 
-WORKDIR /opt/kafka-specs
+WORKDIR /opt/jikkou
 
-COPY --from=0 /kafka-specs .
+COPY --from=0 /jikkou .
 
-LABEL io.streamthoughts.docker.name="kafka-specs" \
-      io.streamthoughts.docker.version=$KAFKA_SPECS_VERSION \
-      io.streamthoughts.docker.branch=$KAFKA_SPECS_BRANCH \
-      io.streamthoughts.docker.commit=$KAFKA_SPECS_COMMIT
+LABEL io.streamthoughts.docker.name="jikkou" \
+      io.streamthoughts.docker.version=$JIKKOU_VERSION \
+      io.streamthoughts.docker.branch=$JIKKOU_BRANCH \
+      io.streamthoughts.docker.commit=$JIKKOU_COMMIT
 
-ENTRYPOINT ["/bin/bash","/opt/kafka-specs/bin/kafka-specs"]
+ENTRYPOINT ["/bin/bash","/opt/jikkou/bin/jikkou"]
 
 
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ GIT_COMMIT := $(shell git rev-parse --short HEAD)
 GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
 
 REPOSITORY = streamthoughts
-IMAGE = kafka-specs
+IMAGE = jikkou
 
 .SILENT:
 
@@ -33,9 +33,9 @@ build-images:
 	echo "==========================================\n "
 	./gradlew clean distZip && \
 	docker build \
-	--build-arg kafkaSpecsVersion=${PROJECT_VERSION} \
-	--build-arg kafkaSpecsCommit=${GIT_COMMIT} \
-	--build-arg kafkaSpecsBranch=${GIT_BRANCH} \
+	--build-arg jikkouVersion=${PROJECT_VERSION} \
+	--build-arg jikkouCommit=${GIT_COMMIT} \
+	--build-arg jikkouBranch=${GIT_BRANCH} \
     -f Dockerfile \
 	-t ${REPOSITORY}/${IMAGE}:latest . || exit 1 ;
 	docker tag ${REPOSITORY}/${IMAGE}:latest ${REPOSITORY}/${IMAGE}:${PROJECT_VERSION} || exit 1 ;

diff --git a/build.gradle b/build.gradle
@@ -138,11 +138,11 @@ publishing {
     publications {
         mavenJava(MavenPublication) {
             groupId = 'io.streamthoughts'
-            artifactId = 'kafka-specs'
+            artifactId = 'jikkou'
             pom {
-                name = 'KafkaSpecs'
+                name = 'Jikkou'
                 description = 'Tool to ease and automate Apache Kafka cluster configuration management'
-                url = 'https://github.com/streamthoughts/kafka-specs'
+                url = 'https://github.com/streamthoughts/jikkou'
                 licenses {
                     license {
                         name = 'The Apache License, Version 2.0'
@@ -160,9 +160,9 @@ publishing {
                     }
                 }
                 scm {
-                    connection = 'scm:git:git://github.com/streamthoughts/kafka-specs.git'
-                    developerConnection = 'scm:git:ssh://github.com/streamthoughts/kafka-specs.git'
-                    url = 'https://github.com/streamthoughts/kafka-specs.git'
+                    connection = 'scm:git:git://github.com/streamthoughts/jikkou.git'
+                    developerConnection = 'scm:git:ssh://github.com/streamthoughts/jikkou.git'
+                    url = 'https://github.com/streamthoughts/jikkou.git'
                 }
             }
             from components.java