From 8f09141e6efcb060a16c698163ef4118d0b845d0 Mon Sep 17 00:00:00 2001
From: Milas Bowman <milas.bowman@docker.com>
Date: Tue, 5 Jul 2022 09:42:09 -0400
Subject: [PATCH] apache-php: add dev envs config

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
---
 apache-php/.docker/docker-compose.yaml | 10 ++++++++++
 apache-php/README.md                   | 11 +++++++++++
 apache-php/app/Dockerfile              | 23 ++++++++++++++++++++++-
 apache-php/compose.yaml                |  5 +++--
 4 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 apache-php/.docker/docker-compose.yaml

diff --git a/apache-php/.docker/docker-compose.yaml b/apache-php/.docker/docker-compose.yaml
new file mode 100644
index 0000000..817b0fc
--- /dev/null
+++ b/apache-php/.docker/docker-compose.yaml
@@ -0,0 +1,10 @@
+services:
+  web:
+    build:
+      context: app
+      target: dev-envs
+    ports: 
+      - '80:80'
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - ./app:/var/www/html/
diff --git a/apache-php/README.md b/apache-php/README.md
index 1ef50ad..908faf4 100644
--- a/apache-php/README.md
+++ b/apache-php/README.md
@@ -54,3 +54,14 @@ Stop and remove the containers
 ```
 $ docker compose down
 ```
+
+## Use with Docker Development Environments
+
+You can use this sample with the Dev Environments feature of Docker Desktop.
+
+![Screenshot of creating a Dev Environment in Docker Desktop](../dev-envs.png)
+
+To develop directly on the services inside containers, use the HTTPS Git url of the sample:
+```
+https://github.com/docker/awesome-compose/tree/master/apache-php
+```
diff --git a/apache-php/app/Dockerfile b/apache-php/app/Dockerfile
index 0b19f22..97ccc04 100644
--- a/apache-php/app/Dockerfile
+++ b/apache-php/app/Dockerfile
@@ -1 +1,22 @@
-FROM php:8.0.7-apache
+# syntax=docker/dockerfile:1.4
+
+FROM --platform=$BUILDPLATFORM php:8.0.9-apache as builder
+
+CMD ["apache2-foreground"]
+
+FROM builder 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 ["apache2-foreground"]
diff --git a/apache-php/compose.yaml b/apache-php/compose.yaml
index d4455ce..d15644b 100644
--- a/apache-php/compose.yaml
+++ b/apache-php/compose.yaml
@@ -1,8 +1,9 @@
 services:
   web:
-    build: app
+    build:
+      context: app
+      target: builder
     ports: 
       - '80:80'
     volumes:
       - ./app:/var/www/html/
-