From 00c7d85f0e4c8ddaf41d7f01abcefd40604349f1 Mon Sep 17 00:00:00 2001
From: Guillaume Lours <guillaume.lours@docker.com>
Date: Tue, 12 Jul 2022 12:22:52 +0200
Subject: [PATCH] add configuration to use sparkjava sample with Docker Dev
 Environments feature (#261)

Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
---
 sparkjava/.docker/docker-compose.yaml |  9 +++++++++
 sparkjava/README.md                   |  8 ++++++++
 sparkjava/sparkjava/Dockerfile        | 17 +++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 sparkjava/.docker/docker-compose.yaml

diff --git a/sparkjava/.docker/docker-compose.yaml b/sparkjava/.docker/docker-compose.yaml
new file mode 100644
index 0000000..6912419
--- /dev/null
+++ b/sparkjava/.docker/docker-compose.yaml
@@ -0,0 +1,9 @@
+services:
+  sparkjava:
+    build:
+      context: sparkjava
+      target: dev-envs
+    ports:
+      - 8080:8080
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
diff --git a/sparkjava/README.md b/sparkjava/README.md
index 224f72f..a448233 100644
--- a/sparkjava/README.md
+++ b/sparkjava/README.md
@@ -59,3 +59,11 @@ Stopping sparkjava_sparkjava_1 ... done
 Removing sparkjava_sparkjava_1 ... done
 Removing network sparkjava_default
 ```
+
+## Use with Docker Development Environments
+
+You can use this sample with the Dev Environments feature of Docker Desktop.  
+To develop directly sparkjava service inside containers, you just need to use the https git url of the sample:  
+`https://github.com/docker/awesome-compose/tree/master/sparkjava`
+
+![page](../dev-envs.png)
diff --git a/sparkjava/sparkjava/Dockerfile b/sparkjava/sparkjava/Dockerfile
index d306fa2..0d9e7e7 100755
--- a/sparkjava/sparkjava/Dockerfile
+++ b/sparkjava/sparkjava/Dockerfile
@@ -1,3 +1,5 @@
+# syntax=docker/dockerfile:1.4
+
 FROM --platform=$BUILDPLATFORM maven:3.8.5-eclipse-temurin-17 AS build
 WORKDIR /workdir/server
 COPY pom.xml /workdir/server/pom.xml
@@ -7,6 +9,21 @@ COPY src /workdir/server/src
 
 RUN mvn --batch-mode clean compile assembly:single
 
+FROM build AS dev-envs
+RUN <<EOF
+apt-get update
+apt-get install -y --no-install-recommends git
+EOF
+
+RUN <<EOF
+useradd -s /bin/bash -m vscode
+groupadd docker
+usermod -aG docker vscode
+EOF
+# install Docker tools (cli, buildx, compose)
+COPY --from=gloursdocker/docker / /
+CMD ["java", "-jar", "target/app.jar" ]
+
 FROM eclipse-temurin:17-jre-focal
 ARG DEPENDENCY=/workdir/server/target
 EXPOSE 8080