From c6a7c2cab2d1fdf7aadfe12a42434e440d879c7f Mon Sep 17 00:00:00 2001
From: "Chris (wolcen) Thompson" <chris@agaric.coop>
Date: Wed, 27 Mar 2024 21:49:39 -0400
Subject: [PATCH] Reduce layer count and update docs

---
 Dockerfile | 18 +++++++++---------
 README.md  |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 50fea04..33c4bdf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,21 +8,21 @@ RUN php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec
 RUN php composer-setup.php
 RUN php -r "unlink('composer-setup.php');"
 RUN mv composer.phar /usr/local/bin/composer
-RUN apt-get update -yqq && apt-get install -yqq git 7zip libzip-dev rsync
+RUN apt-get update -yqq && apt-get install -yqq git zip unzip 7zip libzip-dev rsync && rm -rf /var/lib/apt/lists/*
 RUN mv /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini
-RUN docker-php-ext-install zip
+#RUN docker-php-ext-install zip
+
 ARG user=deployer
 ARG group=deployer
 ARG uid=1000
 ARG gid=1000
 RUN groupadd -g ${gid} ${group}
 RUN useradd -u ${uid} -g ${group} -s /bin/sh -m ${user}
-USER ${uid}:${gid}
-WORKDIR /home/deployer
-RUN mkdir ~/.ssh
-RUN touch ~/.ssh/config
-RUN chmod 700 ~/.ssh
-COPY known_hosts ~/.ssh/known_hosts
-RUN chmod 600 ~/.ssh/*
 
+WORKDIR /home/deployer
+RUN mkdir .ssh && touch .ssh/config
+COPY known_hosts .ssh/known_hosts
+RUN chmod 700 .ssh && chmod 600 .ssh/* && chown -R ${user}:${group} .ssh
+
+USER ${uid}:${gid}
 CMD /bin/bash
diff --git a/README.md b/README.md
index b34458a..7d5d695 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,7 @@ To do a build/push to our container registry, first create a token at https://gi
 
 Then, run:
 ```
-docker build -t agaric/deploycontainer:latest .
-docker tag agaric/deploycontainer:latest git.agaric.com/agaric/deploycontainer:latest 
+docker build -t git.agaric.com/agaric/deploycontainer:latest .
 docker push git.agaric.com/agaric/deploycontainer:latest
 ```