From 4eb7fec26b9c26441963d6c72cd936cf8a481a97 Mon Sep 17 00:00:00 2001
From: Akram <tabkram@gmail.com>
Date: Mon, 20 Nov 2023 16:45:48 +0100
Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=A4=20add=20node=2020?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 4 ++++
 README.md                   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7c5784..aaebd69 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,6 +20,10 @@ jobs:
           full_node_version: v18.12.0
           terraform_version: 1.3.3
           terragrunt_version: 0.39.2
+        - node_version: 20
+          full_node_version: v20.9.0
+          terraform_version: 1.3.3
+          terragrunt_version: 0.39.2
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
diff --git a/README.md b/README.md
index 18560f4..511f4ba 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ There are 3 images for every supported nodejs runtimes (only nodejs 14, 16 and 1
 - nodejs_devops:14
 - nodejs_devops:16
 - nodejs_devops:18
+- nodejs_devops:20
 
 ## Docker image content
 

From 0006d00466e5c60f44c615b28b0fd6f70875625b Mon Sep 17 00:00:00 2001
From: Akram <tabkram@gmail.com>
Date: Mon, 20 Nov 2023 18:46:40 +0100
Subject: [PATCH 2/2] separate commands and add install pyyaml==5.3.1 before
 install docker-compose

The issue doesn't occur with a lower version of PyYaml (5.3.1) that is still supported by docker-compose. So a workaround would be:

pip install pyyaml==5.3.1
then:
pip install docker-compose

see:

https://github.com/docker/compose/issues/11168#issuecomment-1800362132
---
 .github/workflows/build.yml | 4 ++--
 Dockerfile                  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index aaebd69..c2c75e3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,9 +37,9 @@ jobs:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
+      uses: docker/setup-buildx-action@v3
     - name: Build and push
-      uses: docker/build-push-action@v3
+      uses: docker/build-push-action@v5
       with:
         build-args: |
           NODE_VERSION=${{ matrix.node_version }}
diff --git a/Dockerfile b/Dockerfile
index dbaa764..97a4442 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,7 +50,11 @@ RUN apk update
 RUN apk upgrade --available
 RUN apk add --no-cache curl wget zip tar python3 py3-pip git openssl openssh-client jq
 RUN apk add --no-cache bash tar gzip openrc yarn ansible
-RUN pip3 install --upgrade pip docker-compose yq --ignore-installed distlib
+RUN pip3 install --upgrade pip --ignore-installed distlib
+RUN pip3 install --upgrade yq --ignore-installed distlib
+# https://github.com/docker/compose/issues/11168#issuecomment-1800362132
+RUN pip install pyyaml==5.3.1
+RUN pip3 install --upgrade --no-cache-dir docker-compose
 RUN rm -rf /var/cache/apk/*
 RUN ansible --version