Merge pull request #3 from barnhill/update-springboot-multi-platform-images

barnhill · web-flow · commit cb7954a6fb24 · 2023-03-04T20:23:21.000-06:00
Update Springboot / multi platform images
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -13,7 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
+      with:
+        distribution: 'zulu' # See 'Supported distributions' for available options
+        java-version: '17'
+    - uses: docker/setup-buildx-action@v2
     - name: Login to Docker
       run: echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
       env:
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm64v8/openjdk:slim
+FROM amazoncorretto:17
 MAINTAINER bradfordbarnhill@gmail.com
 
 ADD build/libs/barcode-api.jar /
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 wrapper {
     //if you change this version you will need to run the 'gradlew wrapper' command twice from the command line to auto update the gradle cache
-    gradleVersion = "7.5.1"
+    gradleVersion = "8.0.1"
 }
 buildscript {
     repositories {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:2.7.3")
+        classpath("org.springframework.boot:spring-boot-gradle-plugin:3.0.2")
     }
 }
 
@@ -20,15 +20,15 @@ apply plugin: 'war'
 
 group = 'com.pnuema.java.barcode'
 version '1.13'
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = 17
+targetCompatibility = 17
 
 bootJar {
-    archiveName = 'barcode-api.jar'
+    archiveFileName = 'barcode-api.jar'
 }
 
 war {
-    archiveName = 'barcode-api.war'
+    archiveFileName = 'barcode-api.war'
 }
 
 repositories {
@@ -48,7 +48,7 @@ dependencies {
     implementation 'com.pnuema.java:barcode:1.13'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
-    implementation 'org.springdoc:springdoc-openapi-ui:1.6.11'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,12 +1,23 @@
 services:
-  linux:
+  linux-arm64:
     platform: linux/arm64
     # Linux Container
     build:
       context: .
-      dockerfile: ./Dockerfile
+      dockerfile: Dockerfile
     ports:
       - "8080:8080"
     expose:
       - 8080
-    image: bradbarnhill/barcode-api
+    image: bradbarnhill/barcode-api:arm64
+  linux-amd64:
+    platform: linux/amd64
+    # Linux Container
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    expose:
+      - 8080
+    image: bradbarnhill/barcode-api:amd64
diff --git a/dockerbuild.bat b/dockerbuild.bat
@@ -0,0 +1 @@
+./gradlew clean bootJar & docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag bradbarnhill/barcode-api:latest .
diff --git a/dockerbuild.sh b/dockerbuild.sh
@@ -1,3 +1,3 @@
 ./gradlew clean bootJar
-docker-compose build linux
-docker-compose push linux
+
+docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag bradbarnhill/barcode-api:latest .
diff --git a/dockerrun.bat b/dockerrun.bat
@@ -0,0 +1 @@
+docker run --rm -p 8080:8080 bradbarnhill/barcode-api
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/local.properties b/local.properties
@@ -4,5 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Mon Jan 03 21:01:30 CST 2022
-sdk.dir=C\:\\Users\\bradb\\AppData\\Local\\Android\\Sdk
+#Sun Feb 26 21:24:08 CST 2023
+sdk.dir=/Users/b359923/Library/Android/sdk
diff --git a/pom.xml b/pom.xml
@@ -27,6 +27,10 @@
     <developerConnection>https://github.com/barnhill/barcode-java.git</developerConnection>
     <url>https://github.com/barnhill/barcode-java</url>
   </scm>
+  <properties>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+  </properties>
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -55,5 +59,15 @@
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
     </dependency>
+      <dependency>
+          <groupId>org.apache.tomcat.embed</groupId>
+          <artifactId>tomcat-embed-core</artifactId>
+          <version>9.0.52</version>
+      </dependency>
+    <dependency>
+      <groupId>io.swagger.core.v3</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>2.1.2</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/src/main/java/com/pnuema/java/barcode/barcodeapi/BarcodeApiApplication.java b/src/main/java/com/pnuema/java/barcode/barcodeapi/BarcodeApiApplication.java
@@ -1,13 +1,17 @@
 package com.pnuema.java.barcode.barcodeapi;
 
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.servers.Server;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.filter.ShallowEtagHeaderFilter;
 
-import javax.servlet.Filter;
-
+@OpenAPIDefinition(servers = {
+        @Server(url = "https://barcodeapi.link/", description = "Remote"),
+        @Server(url = "http://localhost:8080/", description = "Local")
+})
 @SpringBootApplication
 @EnableCaching
 public class BarcodeApiApplication {
@@ -16,7 +20,7 @@ public static void main(String[] args) {
     }
 
     @Bean
-    public Filter filter(){
+    public ShallowEtagHeaderFilter shallowEtagHeaderFilter() {
         return new ShallowEtagHeaderFilter();
     }
 }
diff --git a/src/main/java/com/pnuema/java/barcode/barcodeapi/BarcodeBody.java b/src/main/java/com/pnuema/java/barcode/barcodeapi/BarcodeBody.java
@@ -0,0 +1,82 @@
+package com.pnuema.java.barcode.barcodeapi;
+
+import java.util.Optional;
+
+@SuppressWarnings("unused")
+public class BarcodeBody {
+    private String type;
+    private String data;
+    private Integer w;
+    private Integer h;
+    private boolean label;
+    private String barcolor;
+    private String background;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Optional<Integer> getW() {
+        if (w == null)
+            return Optional.empty();
+        else
+            return Optional.of(w);
+    }
+
+    public void setW(Integer w) {
+        this.w = w;
+    }
+
+    public Optional<Integer> getH() {
+        if (h == null)
+            return Optional.empty();
+        else
+            return Optional.of(h);
+    }
+
+    public void setH(Integer h) {
+        this.h = h;
+    }
+
+    public Optional<Boolean> isLabel() {
+        return Optional.of(label);
+    }
+
+    public void setLabel(boolean label) {
+        this.label = label;
+    }
+
+    public Optional<String> getBarcolor() {
+        if (barcolor == null)
+            return Optional.empty();
+        else
+            return Optional.of(barcolor);
+    }
+
+    public void setBarcolor(String barcolor) {
+        this.barcolor = barcolor;
+    }
+
+    public Optional<String> getBackground() {
+        if (background == null)
+            return Optional.empty();
+        else
+            return Optional.of(background);
+    }
+
+    public void setBackground(String background) {
+        this.background = background;
+    }
+}
diff --git a/src/main/java/com/pnuema/java/barcode/barcodeapi/controllers/v1/BarcodeController.java b/src/main/java/com/pnuema/java/barcode/barcodeapi/controllers/v1/BarcodeController.java
diff --git a/src/main/java/com/pnuema/java/barcode/barcodeapi/errors/BarcodeErrorController.java b/src/main/java/com/pnuema/java/barcode/barcodeapi/errors/BarcodeErrorController.java
diff --git a/target/classes/application-prod.yml b/target/classes/application-prod.yml
diff --git a/target/classes/application.yml b/target/classes/application.yml
diff --git a/target/classes/public/images/upca.gif b/target/classes/public/images/upca.gif
diff --git a/target/classes/public/index.html b/target/classes/public/index.html

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM arm64v8/openjdk:slim`
	`1`	`+FROM amazoncorretto:17`
`2`	`2`	`MAINTAINER bradfordbarnhill@gmail.com`
`3`	`3`
`4`	`4`	`ADD build/libs/barcode-api.jar /`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`wrapper {`
`2`	`2`	`//if you change this version you will need to run the 'gradlew wrapper' command twice from the command line to auto update the gradle cache`
`3`		`- gradleVersion = "7.5.1"`
	`3`	`+ gradleVersion = "8.0.1"`
`4`	`4`	`}`
`5`	`5`	`buildscript {`
`6`	`6`	`repositories {`
`7`	`7`	`mavenCentral()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath("org.springframework.boot:spring-boot-gradle-plugin:2.7.3")`
	`10`	`+ classpath("org.springframework.boot:spring-boot-gradle-plugin:3.0.2")`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`
`@@ -20,15 +20,15 @@ apply plugin: 'war'`
`20`	`20`
`21`	`21`	`group = 'com.pnuema.java.barcode'`
`22`	`22`	`version '1.13'`
`23`		`-sourceCompatibility = 11`
`24`		`-targetCompatibility = 11`
	`23`	`+sourceCompatibility = 17`
	`24`	`+targetCompatibility = 17`
`25`	`25`
`26`	`26`	`bootJar {`
`27`		`- archiveName = 'barcode-api.jar'`
	`27`	`+ archiveFileName = 'barcode-api.jar'`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`war {`
`31`		`- archiveName = 'barcode-api.war'`
	`31`	`+ archiveFileName = 'barcode-api.war'`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`repositories {`
`@@ -48,7 +48,7 @@ dependencies {`
`48`	`48`	`implementation 'com.pnuema.java:barcode:1.13'`
`49`	`49`	`implementation 'org.springframework.boot:spring-boot-starter-web'`
`50`	`50`	`providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'`
`51`		`- implementation 'org.springdoc:springdoc-openapi-ui:1.6.11'`
	`51`	`+ implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'`
`52`	`52`	`testImplementation 'org.springframework.boot:spring-boot-starter-test'`
`53`	`53`	`implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+./gradlew clean bootJar & docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag bradbarnhill/barcode-api:latest .`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+docker run --rm -p 8080:8080 bradbarnhill/barcode-api`