From d63115a0f119766ba4171c5dbd9bb7adad5416ca Mon Sep 17 00:00:00 2001
From: John Bampton <418747+jbampton@users.noreply.github.com>
Date: Sat, 6 May 2023 01:40:13 +1000
Subject: [PATCH] docker: use less image layers and update compose version

https://stackoverflow.com/questions/30256386/how-to-copy-multiple-files-in-one-layer-using-a-dockerfile

https://docs.docker.com/compose/compose-file/compose-file-v3/
---
 Dockerfile         | 6 +-----
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f66995625..c4419b4f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y python3-pip she
 
 WORKDIR /app
 
-COPY Gemfile .
-
-COPY Gemfile.lock .
-
-COPY .pre-commit-config.yaml .
+COPY Gemfile Gemfile.lock .pre-commit-config.yaml ./
 
 RUN bundle install && pip3 install pre-commit && git init . && pre-commit install-hooks
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 223e85af2..55b61a874 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+version: '3.8'
 services:
   test:
     build: