Skip to content

Commit 5a9f290

Browse files
committed
Remove unused step and add missing build args
1 parent 2d6af9f commit 5a9f290

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

.github/workflows/build.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ jobs:
3030

3131
- name: Build image
3232
run: |-
33-
docker build -t $IMAGE_NAME:$IMAGE_TAG .
33+
docker build \
34+
--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
35+
--build-arg VCS_REF=${{ github.sha }} \
36+
--build-arg VERSION=${{ github.ref_name }} \
37+
-t $IMAGE_NAME:$IMAGE_TAG .
3438
3539
- name: Smoke test image
3640
run: |-
@@ -72,10 +76,6 @@ jobs:
7276
--build-arg VERSION=latest \
7377
.
7478
75-
- name: Set tag in environment
76-
if: contains(github.ref, 'refs/tags/')
77-
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
78-
7979
- name: Parse version components
8080
if: contains(github.ref, 'refs/tags/')
8181
id: parse_version

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ Or mount your own code to be served by PHP-FPM & Nginx
4040
docker run -p 80:8080 -v ~/my-codebase:/var/www/html trafex/php-nginx
4141

4242
## Versioning
43-
4443
This image follows semantic versioning;
4544

46-
- `latest` - Automatically updated weekly with the latest patches from Alpine Linux
47-
- `3` - Latest major version 3.x (follows minor and patch updates)
48-
- `3.9` - Latest version 3.9.x (follows patch updates only)
49-
- `3.9.1` - Specific patch version (immutable)
45+
* `latest` - Latest stable release (automatically updated weekly with the latest patches from Alpine Linux)
46+
* `<major>.<minor>.<patch>` - Specific immutable version (e.g., `3.9.1`, `3.9.2`)
47+
* `<major>.<minor>` - Latest patch version for a minor release (e.g., `3.9``3.9.2`)
48+
* `<major>` - Latest minor and patch version (e.g., `3``3.9.2`)
5049

5150
## Configuration
5251
In [config/](config/) you'll find the default configuration files for Nginx, PHP and PHP-FPM.

0 commit comments

Comments
 (0)