Merge pull request #55 from laradock/develop

rename Dockerfile
laradock · Apr 17, 2021 · 3573bcb · 3573bcb
2 parents 704eb81 + fa8fdaf
commit 3573bcb
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 16 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -15,23 +15,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php_version: [56, 70, 71, 72, 73, 74, 80]
+        php_version: ["5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0"]
     steps:
     - uses: actions/checkout@v2
     - name: Build the Docker image
-      env:
-        PHP_VERSION: ${{ matrix.php_version }}
       run: |
-        export TAG_VERSION=${PHP_VERSION:0:1}.${PHP_VERSION:1:1}
-        docker build . --file Dockerfile-${{ matrix.php_version }} --tag laradock/php-fpm:${{ env.TAG_PREFIX }}-${TAG_VERSION}      
+        docker build . --file Dockerfile-${{ matrix.php_version }} --tag laradock/php-fpm:${{ env.TAG_PREFIX }}-${{ matrix.php_version }}
         docker image ls
 
     - name: Push image to Docker hub
       if: ${{ success() && (github.repository == 'laradock/php-fpm') && (github.ref == 'refs/heads/master') }}
-      env:
-        PHP_VERSION: ${{ matrix.php_version }}
       run: |
-        export TAG_VERSION=${PHP_VERSION:0:1}.${PHP_VERSION:1:1}
         echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USER }} --password-stdin
-        docker push laradock/php-fpm:${{ env.TAG_PREFIX }}-${TAG_VERSION}
+        docker push laradock/php-fpm:${{ env.TAG_PREFIX }}-${{ matrix.php_version }}
         docker logout
diff --git a/.travis.yml b/.travis.yml
@@ -5,13 +5,13 @@ services:
 
 env:
   matrix:
-    - PHP_VERSION=56
-    - PHP_VERSION=70
-    - PHP_VERSION=71
-    - PHP_VERSION=72
-    - PHP_VERSION=73
-    - PHP_VERSION=74
-    - PHP_VERSION=80
+    - PHP_VERSION=5.6
+    - PHP_VERSION=7.0
+    - PHP_VERSION=7.1
+    - PHP_VERSION=7.2
+    - PHP_VERSION=7.3
+    - PHP_VERSION=7.4
+    - PHP_VERSION=8.0
 
 # Installing a newer Docker version
 before_install:

diff --git a/Dockerfile-56 → Dockerfile-5.6 b/Dockerfile-56 → Dockerfile-5.6
diff --git a/Dockerfile-70 → Dockerfile-7.0 b/Dockerfile-70 → Dockerfile-7.0
diff --git a/Dockerfile-71 → Dockerfile-7.1 b/Dockerfile-71 → Dockerfile-7.1
diff --git a/Dockerfile-72 → Dockerfile-7.2 b/Dockerfile-72 → Dockerfile-7.2
diff --git a/Dockerfile-73 → Dockerfile-7.3 b/Dockerfile-73 → Dockerfile-7.3
diff --git a/Dockerfile-74 → Dockerfile-7.4 b/Dockerfile-74 → Dockerfile-7.4
diff --git a/Dockerfile-80 → Dockerfile-8.0 b/Dockerfile-80 → Dockerfile-8.0