Skip to content

Commit f57b8a0

Browse files
committed
Verify php & node version, add readme
1 parent b9e5dad commit f57b8a0

File tree

3 files changed

+50
-24
lines changed

3 files changed

+50
-24
lines changed

Diff for: .github/workflows/push-docker-container.yml

+9-15
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,18 @@ jobs:
1919
fail-fast: true
2020
matrix:
2121
include:
22-
# - ubuntu-version: 20.04
23-
# php-version: 8.1
24-
# node-version: 12
25-
# - ubuntu-version: 20.04
26-
# php-version: 8.1
27-
# node-version: 20
22+
- ubuntu-version: 20.04
23+
php-version: 8.1
24+
node-version: 12
2825
- ubuntu-version: 20.04
2926
php-version: 8.2
3027
node-version: 12
31-
# - ubuntu-version: 20.04
32-
# php-version: 8.2
33-
# node-version: 20
34-
# - ubuntu-version: 20.04
35-
# php-version: 8.3
36-
# node-version: 12
37-
# - ubuntu-version: 20.04
38-
# php-version: 8.3
39-
# node-version: 20
28+
- ubuntu-version: 22.04
29+
php-version: 8.2
30+
node-version: 12
31+
- ubuntu-version: 22.04
32+
php-version: 8.3
33+
node-version: 12
4034

4135
steps:
4236
-

Diff for: Dockerfile

+4-9
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,14 @@ RUN apt-get update && \
6767
apt-get clean && rm -rf /var/cache/apt/lists
6868

6969
# Composer
70-
RUN curl -sS https://getcomposer.org/installer | php && \
71-
mv composer.phar /usr/local/bin/composer && \
72-
chmod +x /usr/local/bin/composer && \
73-
composer self-update
70+
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
7471

7572
RUN curl https://get.volta.sh | bash
7673

7774
# Other
7875
RUN mkdir ~/.ssh && \
7976
touch ~/.ssh_config
8077

81-
# Display versions installed
82-
RUN php -v
83-
RUN composer --version
84-
RUN node -v
85-
RUN npm -v
78+
# verify versions installed
79+
RUN php -v && php -r "exit((int)!version_compare(PHP_MAJOR_VERSION . '.' . PHP_MINOR_VERSION, '${PHP_VERSION}', '='));"
80+
RUN node -v && [ `node -v | sed -e "s/^v//" -e "s/\..*$//"` -eq ${NODE_VERSION} ]

Diff for: README.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Docker image for Continuous Integration
2+
3+
## Available tags
4+
5+
See the [docker-ci-php-node package](https://github.com/justbetter/docker-ci-php-node/pkgs/container/docker-ci-php-node)
6+
The tag format is as follows: `<branch/tag>-<ubuntu version>-<php version>-<node version>`
7+
8+
Missing a version? Make a PR adding this to [the version matrix](https://github.com/justbetter/docker-ci-php-node/blob/master/.github/workflows/push-docker-container.yml)
9+
10+
## System information
11+
* [Ubuntu](https://ubuntu.com/)
12+
13+
## Installed packages
14+
* ssh
15+
* openssh-client
16+
* rsync
17+
* curl
18+
* wget
19+
* PHP
20+
* mysql
21+
* pgsql
22+
* memcached
23+
* sqlite
24+
* bz2
25+
* zip
26+
* mbstring
27+
* curl
28+
* gd
29+
* xml
30+
* bcmath
31+
* intl
32+
* imap
33+
* [Composer](https://getcomposer.org/)
34+
* [PHPUnit](https://phpunit.de/)
35+
* [Node.js](https://nodejs.org/)
36+
* [npm](https://www.npmjs.com/)
37+
* [volta](https://volta.sh/)

0 commit comments

Comments
 (0)