Misc fixes

Author: mikera

Dockerfile

@@ -1,31 +1,56 @@
 # Docker for Convex 
 
-# FROM maven:3.9.9-eclipse-temurin-22 AS build
-# #ENV HOME=/home/convex
-# WORKDIR $HOME
-# ADD . $HOME
-# RUN mvn clean package
+# Build stage
+FROM maven:3.9.9-eclipse-temurin-22-jammy AS build
+WORKDIR /build
+COPY . .
+RUN mvn clean install -DskipTests
 
 # Run stage
+FROM eclipse-temurin:22-jre-alpine AS run
+
+# Add labels
+LABEL org.opencontainers.image.title="Convex"
+LABEL org.opencontainers.image.description="Convex Peer Node"
+LABEL org.opencontainers.image.source="https://github.com/Convex-Dev/convex"
+
+# Create non-root user
+RUN addgroup -S convex && adduser -S convex -G convex
+
+# Set environment variables
+ENV HOME=/home/convex \
+    CONVEX_HTTP_PORT=8080 \
+    CONVEX_BINARY_PORT=18888 \
+    CONVEX_HTTPS_PORT=443
 
-FROM eclipse-temurin:22-jdk-alpine AS run
-ENV HOME=/home/convex
 WORKDIR $HOME
-COPY ./convex-integration/target/convex.jar convex.jar
 
-##### Expose ports. These can be mapped to host ports
+# Copy application jar from build stage
+COPY --from=build /build/convex-integration/target/convex.jar convex.jar
 
-# Convex binary protocol port
-EXPOSE 18888 
+# Set proper permissions
+RUN chown -R convex:convex $HOME && \
+    chmod 500 convex.jar
 
-# HTTP port. Can be used for an HTTPS proxy
-EXPOSE 8080  
+# Create and set permissions for volumes
+RUN mkdir -p /etc/convex/keystore && \
+    chown -R convex:convex /etc/convex
 
-# HTTPS port. Usable if server has a certificate
-EXPOSE 443
+# Switch to non-root user
+USER convex
 
+# Expose ports
+EXPOSE $CONVEX_BINARY_PORT
+EXPOSE $CONVEX_HTTP_PORT
+EXPOSE $CONVEX_HTTPS_PORT
+
+# Define volumes
 VOLUME ["/etc/ssl/certs"]
 VOLUME ["/etc/convex/keystore"]
 
+# Health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=30s --retries=3 \
+    CMD wget --no-verbose --tries=1 --spider http://localhost:${CONVEX_HTTP_PORT}/api/v1/status || exit 1
+
 ENTRYPOINT ["java", "-jar", "convex.jar", "peer", "start"]
 

convex-core/src/main/java/convex/core/store/AStore.java

@@ -90,7 +90,7 @@ public abstract class AStore implements Closeable {
 	 */
 	public <T extends ACell> T getRootData() throws IOException {
 		Ref<T> ref=getRootRef();
-		if (ref==null) throw new MissingDataException(this,getRootHash());
+		if (ref==null) return null;
 		return ref.getValue();
 	}
 

convex-restapi/pom.xml

@@ -44,17 +44,6 @@
 				</executions>
 				-->
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<excludes>
-					<!-- 
-						<exclude>openapi-plugin/**</exclude>>
-						-->
-					</excludes>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>