Use common base docker images to share layers across service images

geoserver · Dec 14, 2023 · 8c75083 · 8c75083
1 parent b29085a
commit 8c75083
Show file tree

Hide file tree

Showing 35 changed files with 501 additions and 410 deletions.
diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -43,6 +43,10 @@ jobs:
       run: |
         make test
 
+    - name: Build images
+      run: |
+        make build-image
+
     - name: Remove project jars from cached repository
       run: |
         rm -rf ~/.m2/repository/org/geoserver

diff --git a/Makefile b/Makefile
@@ -18,10 +18,14 @@ install:
 test:
 	./mvnw verify -ntp -T4
 
-build-image: build-image-infrastructure build-image-geoserver
+build-image: build-base-images build-image-infrastructure build-image-geoserver
 
 build-image-openj9: build-image-infrastructure-openj9 build-image-geoserver-openj9
 
+build-base-images:
+	./mvnw clean package -f src/apps/base-images \
+	-Ddocker -Ddockerfile.push.skip=true -ntp -Dfmt.skip -DskipTests
+
 build-image-infrastructure:
 	./mvnw clean package -f src/apps/infrastructure \
 	-Ddocker -Ddockerfile.push.skip=$(SKIP_PUSH) -ntp -Dfmt.skip -DskipTests

diff --git a/src/apps/base-images/geoserver/Dockerfile b/src/apps/base-images/geoserver/Dockerfile
@@ -0,0 +1,38 @@
+ARG TAG=latest
+FROM geoservercloud/gs-cloud-base-jre:$TAG as builder
+ARG JAR_FILE=target/gs-cloud-*-bin.jar
+
+COPY ${JAR_FILE} application.jar
+
+RUN java -Djarmode=layertools -jar application.jar extract
+
+##########
+FROM geoservercloud/gs-cloud-base-spring-boot:$TAG
+
+# init
+RUN apt update \
+&& apt -y upgrade \
+&& apt install -y --no-install-recommends \
+fonts-deva \
+fonts-font-awesome \
+fonts-freefont-ttf \
+fonts-material-design-icons-iconfont \
+fonts-materialdesignicons-webfont \
+fonts-roboto \
+&& apt clean \
+&& apt purge -y  \
+&& apt autoremove --purge -y \
+&& rm -rf /var/cache/apt/* \
+&& rm -rf /var/lib/apt/lists/*
+
+RUN mkdir -p /opt/app/data_directory /data/geowebcache \
+&& chmod 0777 /opt/app/data_directory /data/geowebcache
+
+VOLUME /opt/app/data_directory
+VOLUME /data/geowebcache
+
+WORKDIR /opt/app/bin
+
+COPY --from=builder dependencies/ ./
+COPY --from=builder snapshot-dependencies/ ./
+COPY --from=builder spring-boot-loader/ ./
diff --git a/src/apps/base-images/geoserver/pom.xml b/src/apps/base-images/geoserver/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.geoserver.cloud.apps</groupId>
+    <artifactId>gs-cloud-base-images</artifactId>
+    <version>${revision}</version>
+  </parent>
+  <artifactId>gs-cloud-base-geoserver-image</artifactId>
+  <packaging>jar</packaging>
+  <properties>
+    <dockerfile.skip>false</dockerfile.skip>
+    <docker.image.name>${project.artifactId}</docker.image.name>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-spring-factory</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-webmvc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-event-bus</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>spring-boot-simplejndi</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-vector-formats</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud</groupId>
+      <artifactId>gs-cloud-starter-raster-formats</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-bootstrap</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.retry</groupId>
+      <artifactId>spring-retry</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-aop</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.geoserver.cloud.apps</groupId>
+      <artifactId>gs-cloud-base-spring-boot</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>docker</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.spotify</groupId>
+            <artifactId>dockerfile-maven-plugin</artifactId>
+            <configuration>
+              <pullNewerImage>false</pullNewerImage>
+            </configuration>
+            <executions>
+              <execution>
+                <id>push</id>
+                <configuration>
+                  <!-- always skip push -->
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/src/apps/base-images/geoserver/src/main/java/org/geoserver/cloud/app/dummy/DummyApp.java b/src/apps/base-images/geoserver/src/main/java/org/geoserver/cloud/app/dummy/DummyApp.java
@@ -0,0 +1,18 @@
+/*
+ * (c) 2022 Open Source Geospatial Foundation - all rights reserved This code is licensed under the
+ * GPL 2.0 license, available at the root application directory.
+ */
+package org.geoserver.cloud.app.dummy;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @since 1.0
+ */
+@SpringBootApplication
+public class DummyApp {
+
+    public static void main(String... args) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/src/apps/base-images/jre/Dockerfile b/src/apps/base-images/jre/Dockerfile
@@ -0,0 +1,16 @@
+FROM eclipse-temurin:17-jre
+
+LABEL maintainer="GeoServer PSC <[email protected]>"
+
+ENV JAVA_TOOL_OPTS="\
+--add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+--add-opens=java.base/java.text=ALL-UNNAMED \
+--add-opens=java.desktop/java.awt.font=ALL-UNNAMED \
+--add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \
+--add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \
+-Djava.awt.headless=true"
+
+ENV JAVA_OPTS=
diff --git a/src/apps/base-images/jre/pom.xml b/src/apps/base-images/jre/pom.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.geoserver.cloud.apps</groupId>
+    <artifactId>gs-cloud-base-images</artifactId>
+    <version>${revision}</version>
+  </parent>
+  <artifactId>gs-cloud-base-jre</artifactId>
+  <packaging>jar</packaging>
+  <name>Base JRE image</name>
+  <properties>
+    <dockerfile.skip>false</dockerfile.skip>
+    <docker.image.name>${project.artifactId}</docker.image.name>
+  </properties>
+  <dependencies></dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-maven-plugin</artifactId>
+        <version>${spring-boot.version}</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <profiles>
+    <profile>
+      <id>docker</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+        <property>
+          <name>docker</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.spotify</groupId>
+            <artifactId>dockerfile-maven-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>push</id>
+                <configuration>
+                  <!-- always skip push -->
+                  <skip>true</skip>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/src/apps/base-images/pom.xml b/src/apps/base-images/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.geoserver.cloud.apps</groupId>
+    <artifactId>gs-cloud-apps</artifactId>
+    <version>${revision}</version>
+  </parent>
+  <artifactId>gs-cloud-base-images</artifactId>
+  <packaging>pom</packaging>
+  <modules>
+    <module>jre</module>
+    <module>spring-boot</module>
+    <module>geoserver</module>
+  </modules>
+</project>
diff --git a/src/apps/base-images/spring-boot/Dockerfile b/src/apps/base-images/spring-boot/Dockerfile
@@ -0,0 +1,44 @@
+ARG TAG=latest
+FROM geoservercloud/gs-cloud-base-jre:$TAG as builder
+ARG JAR_FILE=target/gs-cloud-*-bin.jar
+
+COPY ${JAR_FILE} application.jar
+
+RUN java -Djarmode=layertools -jar application.jar extract
+
+##########
+FROM geoservercloud/gs-cloud-base-jre:$TAG
+
+COPY target/config/ /etc/gscloud/
+
+RUN mkdir -p /opt/app/bin
+
+WORKDIR /opt/app/bin
+
+ENV JAVA_TOOL_OPTS="\
+--add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.util=ALL-UNNAMED \
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+--add-opens=java.base/java.text=ALL-UNNAMED \
+--add-opens=java.desktop/java.awt.font=ALL-UNNAMED \
+--add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \
+--add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \
+-Djava.awt.headless=true"
+
+ENV JAVA_OPTS=
+EXPOSE 8080
+EXPOSE 8081
+
+COPY --from=builder dependencies/ ./
+COPY --from=builder snapshot-dependencies/ ./
+COPY --from=builder spring-boot-loader/ ./
+
+HEALTHCHECK \
+--interval=10s \
+--timeout=5s \
+--start-period=30s \
+--retries=5 \
+CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1
+
+CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher