Skip to content

Commit e5bc164

Browse files
committed
Add phpbenchkit to global binaries
1 parent ed92430 commit e5bc164

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

docker/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,9 @@ RUN \
101101
# Install git alone, or it will ask some geographical configs, I don't know why
102102
RUN apt-get install -y git
103103

104+
COPY --chown=phpbenchmarks docker/entrypoint.sh /usr/local/bin/entrypoint
105+
COPY docker/phpbenchkit.sh /usr/local/bin/phpbenchkit
106+
104107
# Run
105108
WORKDIR /var/benchmark-kit
106-
COPY --chown=phpbenchmarks docker/entrypoint.sh /usr/local/bin/entrypoint
107109
ENTRYPOINT ["entrypoint"]

docker/phpbenchkit.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/usr/bin/env bash
2+
3+
set -eu
4+
5+
/usr/bin/php7.4 /var/benchmark-kit/bin/console $@

phpbenchkit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,4 +172,4 @@ addHost "benchmark-kit.loc"
172172
addHost "phpinfo.benchmark-kit.loc"
173173
addHost "statistics.benchmark-kit.loc"
174174

175-
docker exec $ttyParameter --user=phpbenchmarks $CONTAINER_NAME /usr/bin/php7.4 bin/console $consoleParams
175+
docker exec $ttyParameter --user=phpbenchmarks $CONTAINER_NAME phpbenchkit $consoleParams

templates/benchmark/default/.circleci/config.yml.twig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
steps:
99
- checkout
1010
- run:
11-
name: /var/entrypoint.sh
12-
command: /var/entrypoint.sh --nginx-as-service
11+
name: entrypoint
12+
command: entrypoint --nginx-as-service
1313
- run:
1414
name: "validate:benchmark"
15-
command: "/var/benchmark-kit/bin/console validate:benchmark"
15+
command: "phpbenchkit validate:benchmark -vvv"
1616

1717
workflows:
1818
version: '2.1'

0 commit comments

Comments
 (0)