From 31c3def98cc6b3b4ee480080d09a0c6d739f551e Mon Sep 17 00:00:00 2001
From: Ahmet Ozisik <ozisikahmet@gmail.com>
Date: Wed, 30 Sep 2020 14:25:10 +0300
Subject: [PATCH 1/5] set php version to 7.4, install bcmath
---
Dockerfile | 18 +++++++++---------
README.md | 4 ++--
build-and-push.sh | 6 +++---
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 2c20fe2..753e7b4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,17 @@
-FROM php:7.2
+FROM php:7.4
ARG BUILD_DATE
ARG VCS_REF
ENV COMPOSER_ALLOW_SUPERUSER 1
LABEL Maintainer="Swiftmade <hello@swiftmade.co>" \
- Description="A simple PHP 7.2 image which contain just the minimum required to run Dusk on bitbucket pipelines." \
- org.label-schema.name="swiftmade/laravel-test-container:7.2" \
- org.label-schema.description="A simple PHP 7.2 image which contain just the minimum required to run Dusk on CI/CD pipelines." \
- org.label-schema.build-date=$BUILD_DATE \
- org.label-schema.vcs-url="https://github.com/swiftmade/laravel-test-container" \
- org.label-schema.vcs-ref=$VCS_REF \
- org.label-schema.schema-version="1.0.0"
+ Description="A simple PHP 7.4 image which contain just the minimum required to run Dusk on bitbucket pipelines." \
+ org.label-schema.name="swiftmade/laravel-test-container:7.4" \
+ org.label-schema.description="A simple PHP 7.2 image which contain just the minimum required to run Dusk on CI/CD pipelines." \
+ org.label-schema.build-date=$BUILD_DATE \
+ org.label-schema.vcs-url="https://github.com/swiftmade/laravel-test-container" \
+ org.label-schema.vcs-ref=$VCS_REF \
+ org.label-schema.schema-version="1.0.0"
ENV COMPOSER_ALLOW_SUPERUSER 1
@@ -31,7 +31,7 @@ RUN docker-php-source extract \
&& docker-php-source delete \
&& docker-php-ext-configure pgsql -with-pgsql=/usr/local/pgsql \
&& docker-php-ext-configure gd --with-jpeg \
- && docker-php-ext-install -j"$(nproc)" pdo pdo_mysql pdo_pgsql pgsql intl zip soap gd exif \
+ && docker-php-ext-install -j"$(nproc)" pdo pdo_mysql pdo_pgsql pgsql intl zip soap gd exif bcmath \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& apt-get autoremove \
&& rm -rf /var/lib/apt/lists/*
diff --git a/README.md b/README.md
index b890e6f..19f9db8 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@ Laravel Test Container
Use this docker image to run Laravel tests, including Dusk.
```
-swiftmade/laravel-test-container:7.2
+swiftmade/laravel-test-container:7.4
```
-- 🐘 **PHP Version:** 7.2
+- 🐘 **PHP Version:** 7.4
- 🌍 **Chromium Version:** 80
#### `php -m` output
diff --git a/build-and-push.sh b/build-and-push.sh
index 99db2f8..395aa33 100755
--- a/build-and-push.sh
+++ b/build-and-push.sh
@@ -1,4 +1,4 @@
#!/bin/sh
-docker build . -t swiftmade/laravel-test-container:7.2
-docker push swiftmade/laravel-test-container:7.2
-docker run swiftmade/laravel-test-container:7.2 php -m
\ No newline at end of file
+docker build . -t swiftmade/laravel-test-container:7.4
+docker push swiftmade/laravel-test-container:7.4
+docker run swiftmade/laravel-test-container:7.4 php -m
\ No newline at end of file
From 0cd3d815d3aebea3aa290d553c8d4f0f105bf067 Mon Sep 17 00:00:00 2001
From: Ahmet Ozisik <ozisikahmet@gmail.com>
Date: Wed, 30 Sep 2020 14:26:58 +0300
Subject: [PATCH 2/5] update readme
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 19f9db8..48fb715 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ swiftmade/laravel-test-container:7.4
```
[PHP Modules]
+bcmath
Core
ctype
curl
From f12874cdb8f211474e9fc84ee7e2742ae6c653bd Mon Sep 17 00:00:00 2001
From: Ahmet Ozisik <ozisikahmet@gmail.com>
Date: Wed, 10 Mar 2021 21:31:13 +0200
Subject: [PATCH 3/5] update contents & build script
---
README.md | 14 +++++++++++---
build-and-push.sh | 2 +-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 48fb715..6c9a9b7 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-Laravel Test Container
-======================
+# Laravel Test Container
Use this docker image to run Laravel tests, including Dusk.
@@ -10,9 +9,18 @@ swiftmade/laravel-test-container:7.4
- 🐘 **PHP Version:** 7.4
- 🌍 **Chromium Version:** 80
-#### `php -m` output
+#### What's inside?
```
+PHP 7.4.16 (cli) (built: Mar 6 2021 04:00:29) ( NTS )
+Copyright (c) The PHP Group
+Zend Engine v3.4.0, Copyright (c) Zend Technologies
+ with Xdebug v3.0.3, Copyright (c) 2002-2021, by Derick Rethans
+
+
+Composer version 2.0.11 2021-02-24 14:57:23
+
+
[PHP Modules]
bcmath
Core
diff --git a/build-and-push.sh b/build-and-push.sh
index 395aa33..30f3097 100755
--- a/build-and-push.sh
+++ b/build-and-push.sh
@@ -1,4 +1,4 @@
#!/bin/sh
docker build . -t swiftmade/laravel-test-container:7.4
docker push swiftmade/laravel-test-container:7.4
-docker run swiftmade/laravel-test-container:7.4 php -m
\ No newline at end of file
+docker run --rm swiftmade/laravel-test-container:7.4 /bin/bash -c "php -v && echo $'\n' && composer --version && echo $'\n' && php -m"
\ No newline at end of file
From bbb397f2ff5e33679753fd48f232ae89407fc269 Mon Sep 17 00:00:00 2001
From: Ahmet Ozisik <ozisikahmet@gmail.com>
Date: Tue, 5 Apr 2022 16:13:34 +0300
Subject: [PATCH 4/5] up memory limit to 512M
---
Dockerfile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 753e7b4..a705db7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV COMPOSER_ALLOW_SUPERUSER 1
LABEL Maintainer="Swiftmade <hello@swiftmade.co>" \
Description="A simple PHP 7.4 image which contain just the minimum required to run Dusk on bitbucket pipelines." \
org.label-schema.name="swiftmade/laravel-test-container:7.4" \
- org.label-schema.description="A simple PHP 7.2 image which contain just the minimum required to run Dusk on CI/CD pipelines." \
+ org.label-schema.description="A simple PHP 7.4 image which contain just the minimum required to run Dusk on CI/CD pipelines." \
org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vcs-url="https://github.com/swiftmade/laravel-test-container" \
org.label-schema.vcs-ref=$VCS_REF \
@@ -36,4 +36,6 @@ RUN docker-php-source extract \
&& apt-get autoremove \
&& rm -rf /var/lib/apt/lists/*
-RUN Xvfb -ac :0 -screen 0 1280x1024x16 &
\ No newline at end of file
+RUN Xvfb -ac :0 -screen 0 1280x1024x16 &
+
+RUN echo 'memory_limit = 512M' >> /usr/local/etc/php/conf.d/docker-php-memlimit.ini;
\ No newline at end of file
From 1f2da27fb4bfcf188d0631de3dd878b3f6bcb344 Mon Sep 17 00:00:00 2001
From: Ahmet Ozisik <ozisikahmet@gmail.com>
Date: Tue, 5 Apr 2022 16:14:46 +0300
Subject: [PATCH 5/5] update readme
---
README.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 6c9a9b7..ebff158 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,13 @@ swiftmade/laravel-test-container:7.4
#### What's inside?
```
-PHP 7.4.16 (cli) (built: Mar 6 2021 04:00:29) ( NTS )
+PHP 7.4.28 (cli) (built: Mar 29 2022 03:20:13) ( NTS )
Copyright (c) The PHP Group
Zend Engine v3.4.0, Copyright (c) Zend Technologies
- with Xdebug v3.0.3, Copyright (c) 2002-2021, by Derick Rethans
+ with Xdebug v3.1.4, Copyright (c) 2002-2022, by Derick Rethans
-Composer version 2.0.11 2021-02-24 14:57:23
+Composer version 2.3.3 2022-04-01 22:15:35
[PHP Modules]