Skip to content

Commit 9f63269

Browse files
authored
Merge pull request #42 from laradock/develop
rename Dockerfile
2 parents 6b663cd + 31887ba commit 9f63269

File tree

9 files changed

+10
-16
lines changed

9 files changed

+10
-16
lines changed

.github/workflows/dockerpublish.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,16 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
php_version: [56, 70, 71, 72, 73, 74, 80]
14+
php_version: ["5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0"]
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: Build the Docker image
18-
env:
19-
PHP_VERSION: ${{ matrix.php_version }}
2018
run: |
21-
export TAG_VERSION=${PHP_VERSION:0:1}.${PHP_VERSION:1:1}
22-
docker build . --file Dockerfile-${{ matrix.php_version }} --tag laradock/workspace:latest-${TAG_VERSION}
19+
docker build . --file Dockerfile-${{ matrix.php_version }} --tag laradock/workspace:latest-${{ matrix.php_version }}
2320
docker image ls
2421
- name: Push image to Docker hub
2522
if: ${{ success() && (github.repository == 'laradock/workspace') && (github.ref == 'refs/heads/master') }}
26-
env:
27-
PHP_VERSION: ${{ matrix.php_version }}
2823
run: |
29-
export TAG_VERSION=${PHP_VERSION:0:1}.${PHP_VERSION:1:1}
3024
echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login -u ${{ secrets.DOCKER_HUB_USER }} --password-stdin
31-
docker push laradock/workspace:latest-${TAG_VERSION}
25+
docker push laradock/workspace:latest-${{ matrix.php_version }}
3226
docker logout

.travis.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ services:
55

66
env:
77
matrix:
8-
- PHP_VERSION=56
9-
- PHP_VERSION=70
10-
- PHP_VERSION=71
11-
- PHP_VERSION=72
12-
- PHP_VERSION=73
13-
- PHP_VERSION=74
14-
- PHP_VERSION=80
8+
- PHP_VERSION=5.6
9+
- PHP_VERSION=7.0
10+
- PHP_VERSION=7.1
11+
- PHP_VERSION=7.2
12+
- PHP_VERSION=7.3
13+
- PHP_VERSION=7.4
14+
- PHP_VERSION=8.0
1515

1616
# Installing a newer Docker version
1717
before_install:
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)