Skip to content

Commit a58bd48

Browse files
authored
Merge pull request #1389 from phalcon/3.4.x
3.4.9
2 parents 4a6d908 + de55c8b commit a58bd48

File tree

4 files changed

+42
-1
lines changed

4 files changed

+42
-1
lines changed

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/make -f
2+
3+
.PHONY: image
4+
5+
# ---------------------------------------------------------------------
6+
7+
image:
8+
docker build -t phalcon -f build/BuildPharDockerfile .

README.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@ chmod +xr ./phalcon.phar
7474
php ./phalcon.phar
7575
```
7676

77+
## Build Docker Image
78+
79+
Use make command to build the docker image, It will build the image named `phalcon`:
80+
```bash
81+
make image
82+
```
83+
84+
And run container with following command:
85+
```bash
86+
docker run -it --rm phalcon
87+
```
88+
7789
## Installation via Git
7890

7991
Phalcon Devtools can be installed by using Git.

build/BuildPharDockerfile

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
FROM mileschou/phalcon:5.5-alpine AS builder
2+
3+
WORKDIR /source
4+
5+
RUN apk add --no-cache git
6+
7+
COPY --from=composer /usr/bin/composer /usr/bin/composer
8+
COPY composer.json ./composer.json
9+
RUN composer install
10+
11+
COPY . .
12+
13+
RUN set -xe && \
14+
php -d phar.readonly=off vendor/bin/box build && \
15+
php phalcon.phar
16+
17+
FROM mileschou/phalcon:5.5-alpine
18+
19+
COPY --from=builder /source/phalcon.phar /usr/bin/phalcon
20+
21+
ENTRYPOINT ["sh", "-c", "/usr/bin/phalcon"]

scripts/Phalcon/Devtools/Version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ class Version extends PhVersion
3939
*/
4040
protected static function _getVersion()
4141
{
42-
return [3, 4, 8, 0, 0];
42+
return [3, 4, 9, 0, 0];
4343
}
4444
}

0 commit comments

Comments
 (0)