From 35a7a7c949c139efc044ef2f401b999bbad14d3f Mon Sep 17 00:00:00 2001
From: Carlos Gomes <carlos.algms@gmail.com>
Date: Wed, 18 Oct 2023 15:08:41 +0200
Subject: [PATCH] Adding php7.4 variant

---
 .github/workflows/ci.yml | 14 +++++++++-----
 .gitignore               |  1 +
 Dockerfile               |  2 +-
 Makefile                 |  6 ++++++
 zshrc                    |  1 +
 5 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 .gitignore

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f539395..014dbfa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        tag: [php8, php7.1]
+        tag: [php8, php7.4, php7.1]
         image: [carlosalgms/composer-and-node-ci]
         latest: [php8]
         include:
@@ -19,6 +19,10 @@ jobs:
 
             buildArgs: ""
 
+          - tag: php7.4
+            buildArgs: |
+              PHP_VERSION=7.4
+
           - tag: php7.1
             buildArgs: |
               PHP_VERSION=7.1
@@ -28,17 +32,17 @@ jobs:
       TAGGED_IMAGE: ${{ matrix.image }}:${{ matrix.tag }}
       TAGS: ${{ matrix.tag == matrix.latest && format('{0}:latest,', matrix.image) || '' }}${{ matrix.image }}:${{ matrix.tag }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
         id: docker_login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/Dockerfile b/Dockerfile
index 4bd1601..55e3b5a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,7 +62,7 @@ ADD --chmod=755 \
   /usr/local/bin/composer
 
 
-ARG DEPLOYER_VERSION="v6.8.0"
+ARG DEPLOYER_VERSION="v6.9.0"
 RUN \
   curl -L "https://deployer.org/releases/${DEPLOYER_VERSION}/deployer.phar" \
       --output /usr/local/bin/dep \
diff --git a/Makefile b/Makefile
index 8322351..4987dab 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,12 @@ build_8:
 		-t $(IMAGE):latest \
 		-t $(IMAGE):php8
 
+build_74:
+	docker buildx build --rm . \
+		-f $(TARGET) \
+		--load \
+		--build-arg=PHP_VERSION="7.4" \
+		-t $(IMAGE):php7.4 \
 
 build_71:
 	docker buildx build --rm . \
diff --git a/zshrc b/zshrc
index 35028fb..8dadbb7 100644
--- a/zshrc
+++ b/zshrc
@@ -2,6 +2,7 @@ PROMPT=$'\n'"%B%F{green}%n%f %F{blue}%~%f%b"$'\n'"λ "
 
 alias ls='/bin/ls --color=auto -F --group-directories-first'
 alias ll='ls -l'
+alias lsa='ls -la'
 alias l='ls -lA'
 
 extract () {