bump to version 2.0.0, remove unused mvn docker plugin

clarin-eric · Jul 18, 2019 · b57e2af · b57e2af
1 parent a5d5f20
commit b57e2af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 30 deletions.
diff --git a/INSTALL.md b/INSTALL.md
@@ -16,7 +16,7 @@ Cloning this repository is required. The default settings require it to have the
 
 3. Run the Docker image (but replace /PATH/TO with a real path):
 
-   ```docker run --name switchboard -d -p 8080:8080 -v /PATH/TO/switchboard-tool-registry:/switchboard-tool-registry:ro switchboard/switchboard:2.0.0-beta1 ```
+   ```docker run --name switchboard -d -p 8080:8080 -v /PATH/TO/switchboard-tool-registry:/switchboard-tool-registry:ro switchboard/switchboard:2.0.0 ```
 
    (this may depend on your local computing environment).
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-DOCKERTAG=switchboard/switchboard:2.0.0-beta1
+DOCKERTAG=switchboard/switchboard:2.0.0
 WEBUIAPP=src/main/resources/webui
 JSBUNDLE=$(WEBUIAPP)/bundle.js
 
@@ -31,7 +31,6 @@ dependencies:
 
 clean:
 	(cd backend && mvn -q clean)
-	rm webui/package-lock.json
 	rm -rf webui/node_modules
 	rm -f $(WEBUIAPP)/bundle.js*
 

diff --git a/backend/pom.xml b/backend/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>eu.clarin.switchboard</groupId>
     <artifactId>switchboard</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.0.0</version>
     <properties>
         <dropwizard.version>1.3.9</dropwizard.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -190,32 +190,6 @@
                     </gitDescribe>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>0.4.13</version>
-
-                <configuration>
-                    <imageName>clarin-eric/${project.artifactId}</imageName>
-                    <baseImage>anapsix/alpine-java</baseImage>
-                    <entryPoint>["sh", "/${project.artifactId}/bin/${project.artifactId}", "server","/${project.artifactId}/config.yaml"]</entryPoint>
-                    <imageTags>
-                        <imageTag>${project.version}</imageTag>
-                    </imageTags>
-                    <resources>
-                      <resource>
-                        <targetPath>/${project.artifactId}/</targetPath>
-                        <directory>${project.build.directory}/appassembler</directory>
-                      </resource>
-                      <resource>
-                        <targetPath>/${project.artifactId}/</targetPath>
-                        <directory>${project.basedir}/</directory>
-                        <include>config.yaml</include>
-                      </resource>
-                    </resources>
-                </configuration>
-            </plugin>
         </plugins>
 
         <resources>