From 1d0edbcf394440edc4657755525462a4a75bc790 Mon Sep 17 00:00:00 2001
From: Carlos Gomes <carlos.algms@gmail.com>
Date: Thu, 9 Nov 2023 22:25:23 +0100
Subject: [PATCH] Upgrade Composer and Node Source install

---
 .github/workflows/ci.yml | 3 ++-
 Dockerfile               | 9 ++++++++-
 Makefile                 | 4 +++-
 README.md                | 6 +++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 014dbfa..4ffbb07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,12 +16,13 @@ jobs:
         latest: [php8]
         include:
           - tag: php8
-
             buildArgs: ""
 
           - tag: php7.4
             buildArgs: |
               PHP_VERSION=7.4
+              DEPLOYER_VERSION=v6.6.0
+              COMPOSER_VERSION=2.2.21
 
           - tag: php7.1
             buildArgs: |
diff --git a/Dockerfile b/Dockerfile
index 55e3b5a..0d8b6f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,8 @@ RUN \
   && apt-get upgrade -y \
   && apt-get install -y --no-install-recommends \
     apt-transport-https \
+    ca-certificates \
+    gnupg \
     curl \
     default-mysql-client \
     dirmngr \
@@ -93,7 +95,12 @@ RUN \
 
 # https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions
 RUN \
-  curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
+  sudo mkdir -p /etc/apt/keyrings \
+  curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
+    | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
+  echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x nodistro main" \
+    | tee /etc/apt/sources.list.d/nodesource.list \
+  && apt-get update \
   && apt-get install -y nodejs \
   && npm i -g yarn \
   && apt-get autoremove -y --purge \
diff --git a/Makefile b/Makefile
index 4987dab..2b3e1df 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,8 @@ build_74:
 		-f $(TARGET) \
 		--load \
 		--build-arg=PHP_VERSION="7.4" \
+		--build-arg=DEPLOYER_VERSION="v6.6.0" \
+		--build-arg=COMPOSER_VERSION="latest-2.2.x" \
 		-t $(IMAGE):php7.4 \
 
 build_71:
@@ -22,5 +24,5 @@ build_71:
 		--load \
 		--build-arg=PHP_VERSION="7.1" \
 		--build-arg=DEPLOYER_VERSION="v6.6.0" \
-		--build-arg=COMPOSER_VERSION="2.2.18" \
+		--build-arg=COMPOSER_VERSION="latest-2.2.x" \
 		-t $(IMAGE):php7.1 \
diff --git a/README.md b/README.md
index 2d7fca4..12f8cc1 100644
--- a/README.md
+++ b/README.md
@@ -13,10 +13,10 @@ To deploy and transfer files, [Deployer](https://deployer.org), SSH, and RSync a
 ## This image includes: 
 
 * [NodeJS 18.x and NPM](https://github.com/nodesource/distributions/blob/master/README.md#installation-instructions)
-* [Yarn - latest](https://classic.yarnpkg.com/en/docs/install/#debian-stable)
+* [Yarn - classic](https://classic.yarnpkg.com/en/docs/install/#debian-stable)
 * PHP 8-cli, 7.1-cli
-* [Composer](https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md) (latest or v2.2.18 for php7.1)
-* [Deployer](https://deployer.org) (v6.8.0 or v6.6.0 for php7.1)
+* [Composer](https://getcomposer.org/doc/faqs/how-to-install-composer-programmatically.md) (latest or v2.2.x for php7.x)
+* [Deployer](https://deployer.org) (v6.9.0 or v6.6.0 for php7.x)
 * OpenSSH client
 * Git
 * RSync