Merge pull request #183 from sir-gon/feature/production_ready

Feature/production ready

Author: sir-gon

.vscode/settings.json

@@ -1,7 +1,7 @@
 {
     "java.configuration.updateBuildConfiguration": "automatic",
     "java.compile.nullAnalysis.mode": "automatic",
-    "java.checkstyle.configuration": "${workspaceFolder}/config/checkstyle/checkstyle.xml",
+    "java.checkstyle.configuration": "${workspaceFolder}/checkstyle.xml",
     "java.checkstyle.version": "10.10.0",
     "sonarlint.connectedMode.project": {
         "connectionId": "sir-gon",

Dockerfile

@@ -4,6 +4,8 @@ FROM gradle:8.8.0-jdk21-alpine AS base
 ENV WORKDIR=/app
 WORKDIR ${WORKDIR}
 
+RUN apk add --update --no-cache make
+
 ###############################################################################
 FROM base AS lint
 
@@ -31,9 +33,11 @@ COPY ./CODE_OF_CONDUCT.md ${WORKDIR}/
 # Code source
 COPY ./algorithm-exercises-java ${WORKDIR}/algorithm-exercises-java
 COPY ./settings.gradle ${WORKDIR}/
-COPY ./config ${WORKDIR}/config
 COPY ./Makefile ${WORKDIR}/
 
+# code linting conf
+COPY ./checkstyle.xml ${WORKDIR}/
+
 # markdownlint conf
 COPY ./.markdownlint.yaml ${WORKDIR}/
 
@@ -46,37 +50,36 @@ CMD ["make", "lint"]
 ###############################################################################
 FROM base AS development
 
-RUN apk add --update --no-cache make
+COPY ./algorithm-exercises-java ${WORKDIR}/algorithm-exercises-java
+COPY ./settings.gradle ${WORKDIR}/
+COPY ./Makefile ${WORKDIR}/
+COPY ./checkstyle.xml ${WORKDIR}/
+COPY ./gradle ${WORKDIR}/
+COPY ./gradlew ${WORKDIR}/
 
 ###############################################################################
 FROM development AS builder
 
-WORKDIR /app
-
-## Copy sources to builder stage
-COPY ./algorithm-exercises-java ${WORKDIR}/algorithm-exercises-java
-COPY ./config ${WORKDIR}/config
-COPY ./gradle ${WORKDIR}/gradle
-COPY ./gradlew ${WORKDIR}/gradlew
-COPY ./settings.gradle ${WORKDIR}/settings.gradle
-COPY ./Makefile ${WORKDIR}/Makefile
+ENV WORKDIR=/app
+WORKDIR ${WORKDIR}
 
 ## build
-RUN chmod +x gradlew
-RUN gradle --console=verbose build
+RUN make build
+
+# CMD []
 
 ###############################################################################
 ### In testing stage, can't use USER, due permissions issue
 ## in github actions environment:
 ##
 ## https://docs.github.com/en/actions/creating-actions/dockerfile-support-for-github-actions
 ##
-FROM builder AS testing
+FROM development AS testing
 
 ENV LOG_LEVEL=INFO
 ENV BRUTEFORCE=false
-
-WORKDIR /app
+ENV WORKDIR=/app
+WORKDIR ${WORKDIR}
 
 RUN ls -alh
 
@@ -91,16 +94,18 @@ FROM eclipse-temurin:22.0.1_8-jre-alpine AS production
 
 ENV LOG_LEVEL=INFO
 ENV BRUTEFORCE=false
+ENV WORKDIR=/app
+WORKDIR ${WORKDIR}
 
 RUN adduser -D worker
 RUN mkdir -p /app
 RUN chown worker:worker /app
 
-WORKDIR /app
+RUN apk add --update --no-cache make
+COPY ./Makefile ${WORKDIR}/
+COPY --from=builder /app/algorithm-exercises-java/build/libs/algorithm-exercises-java.jar ${WORKDIR}/algorithm-exercises-java.jar
 
-COPY --from=builder ./algorithm-exercises-java/build/libs/algorithm-exercises-java.jar ${WORKDIR}/algorithm-exercises-java.jar
 RUN ls -alh
 
 USER worker
-
-# CMD []
+CMD ["make", "run"]

Makefile

@@ -74,16 +74,21 @@ outdated:
 clean:
 	$(GRADLE) clean
 
-build: env lint test
-	$(GRADLE) --console=verbose clean build
+build: env
+	$(GRADLE) --console=verbose clean build \
+		--exclude-task test \
+		--exclude-task checkstyleMain \
+		--exclude-task checkstyleTest
 
 compose/build: env
 	docker-compose --profile lint build
 	docker-compose --profile testing build
+	docker-compose --profile production build
 
 compose/rebuild: env
 	docker-compose --profile lint build --no-cache
 	docker-compose --profile testing build --no-cache
+	docker-compose --profile production build --no-cache
 
 compose/lint/markdown: compose/build
 	docker-compose --profile lint run --rm algorithm-exercises-java-lint make lint/markdown
@@ -99,7 +104,13 @@ compose/test/static: compose/build
 
 compose/lint: compose/lint/markdown compose/lint/yaml compose/test/styling compose/test/static
 
+compose/test: compose/build
+	docker-compose --profile testing run --rm algorithm-exercises-java-test make test
+
 compose/run: compose/build
-	docker-compose --profile testing run --rm algorithm-exercises-java make test
+	docker-compose --profile production run --rm algorithm-exercises-java make run
 
 all: env dependencies lint test
+
+run:
+	ls -alh

algorithm-exercises-java/build.gradle

@@ -43,7 +43,7 @@ tasks.named('test') {
 
 checkstyle {
     toolVersion = '10.17.0'
-    configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
+    configFile = file("${rootDir}/checkstyle.xml")
     maxErrors	= 0
     maxWarnings	= 0
     showViolations = true

config/checkstyle/checkstyle.xml renamed to checkstyle.xml

@@ -1,16 +1,17 @@
 ---
 
 services:
-  algorithm-exercises-java:
-    image: algorithm-exercises-java:latest
+  algorithm-exercises-java-test:
+    image: algorithm-exercises-java:test
     build:
       context: .
       target: testing
     environment:
       LOG_LEVEL: ${LOG_LEVEL:-info} ## (1) ## info | debug
       BRUTEFORCE: ${BRUTEFORCE:-false} ## (1) ## true | false
     volumes:
-      - ./build:/app/build
+      # - ./build:/app/build
+      - ./:/app
     profiles: [testing]
 
   algorithm-exercises-java-lint:
@@ -37,6 +38,17 @@ services:
       - ./:/app
     profiles: [development]
 
+  algorithm-exercises-java:
+    image: algorithm-exercises-java:latest
+    build:
+      context: .
+      target: production
+    environment:
+      LOG_LEVEL: ${LOG_LEVEL:-info} ## (1) ## info | debug
+      BRUTEFORCE: ${BRUTEFORCE:-false} ## (1) ## true | false
+    # volumes:
+    #   - ./:/app
+    profiles: [production]
 ## REFERENCES:
 ## (1) Passing Environment variable with fallback value:
 ##    https://stackoverflow.com/a/70772707/6366150