From e49bb8c01ba6eff88d2d29496e81643f373b2c9b Mon Sep 17 00:00:00 2001
From: Yuriy Gerasymov <yuri.gerasimov@gmail.com>
Date: Fri, 2 Aug 2024 15:40:03 -0700
Subject: [PATCH] Further optimizations of the container.

---
 diffy/Dockerfile          | 6 ------
 docker-compose.diffy.yaml | 6 +-----
 install.yaml              | 1 -
 3 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 diffy/Dockerfile

diff --git a/diffy/Dockerfile b/diffy/Dockerfile
deleted file mode 100644
index e68696a..0000000
--- a/diffy/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-#ddev-generated
-FROM diffywebsite2/screenshot-worker:0.0.1
-# I don't know why, but `npm install` tries to use this folder,
-# even when using npm_config_cache=/mnt/ddev-global-cache/npm
-# This should be in the parent Dockerfile
-RUN mkdir /.cache && chmod ugo+w /.cache
diff --git a/docker-compose.diffy.yaml b/docker-compose.diffy.yaml
index 0c6f185..e032814 100644
--- a/docker-compose.diffy.yaml
+++ b/docker-compose.diffy.yaml
@@ -2,11 +2,9 @@
 services:
   diffy:
     container_name: ddev-${DDEV_SITENAME}-diffy
-    build:
-      context: 'diffy'
+    image: 'diffywebsite2/screenshot-worker:0.0.2'
     user: '$DDEV_UID:$DDEV_GID'
     restart: "no"
-    command: tail -f /dev/null
     # These labels ensure this service is discoverable by ddev.
     labels:
       com.ddev.site-name: ${DDEV_SITENAME}
@@ -14,8 +12,6 @@ services:
     environment:
       - DDEV_HOSTNAME
       - npm_config_cache=/mnt/ddev-global-cache/npm
-      - NODE_NO_WARNINGS=1
-    working_dir: "/diffy-worker"
     volumes:
     - ".:/mnt/ddev_config"
     - "ddev-global-cache:/mnt/ddev-global-cache"
diff --git a/install.yaml b/install.yaml
index 5463049..963374b 100644
--- a/install.yaml
+++ b/install.yaml
@@ -46,7 +46,6 @@ project_files:
 - docker-compose.diffy.yaml
 - commands/diffy/screenshot
 - config.diffy.yaml
-- diffy/Dockerfile
 
 # List of files and directories that are copied into the global .ddev directory
 # DDEV environment variables can be interpolated into these filenames