Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 0d213ef
Merge: 4b79f94 2d08b4f
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 26 22:05:19 2024 +0800

    Merge pull request laradock#3517 from amorZhu/master

    Handle Phalcon installation exceptions in php-worker

commit 2d08b4f
Author: zhushaolong <15210900722@163.com>
Date:   Thu Apr 25 18:13:25 2024 +0800

    Update docker-compose.yml

commit df4ef54
Author: zhushaolong <15210900722@163.com>
Date:   Thu Apr 25 18:12:23 2024 +0800

    Update php-worker Dockerfile

commit 4b79f94
Merge: 0d25eae 29c2b34
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 19 12:57:51 2024 +0800

    Merge pull request laradock#3498 from erikn69/patch-23

    Customizable Soketi Server Version

commit 0d25eae
Merge: 38a2672 eee8891
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 19 12:39:39 2024 +0800

    Merge pull request laradock#3481 from erikn69/patch-19

    Fix IONCUBE on Php 8.2

commit 38a2672
Merge: 1775f9f 2004928
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 19 12:36:59 2024 +0800

    Merge pull request laradock#3488 from da-mask/main

    Adding Github CLI to workspace

commit 1775f9f
Merge: 6437958 d798f33
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 19 12:02:49 2024 +0800

    Merge pull request laradock#3511 from laradock/dependabot/npm_and_yarn/react/express-4.19.2

    build(deps): bump express from 4.18.2 to 4.19.2 in /react

commit 6437958
Merge: 93b6aef f6bc0e3
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 19 12:02:35 2024 +0800

    Merge pull request laradock#3509 from laradock/dependabot/npm_and_yarn/react/webpack-dev-middleware-5.3.4

    build(deps): bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /react

commit 93b6aef
Merge: 0d3821f d07e5ff
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 19 12:02:14 2024 +0800

    Merge pull request laradock#3507 from laradock/dependabot/npm_and_yarn/react/follow-redirects-1.15.6

    build(deps): bump follow-redirects from 1.14.8 to 1.15.6 in /react

commit 0d3821f
Merge: 5816497 0f3affb
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Apr 19 12:01:54 2024 +0800

    Merge pull request laradock#3505 from laradock/dependabot/npm_and_yarn/react/ip-2.0.1

    build(deps): bump ip from 2.0.0 to 2.0.1 in /react

commit d798f33
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Mar 28 17:08:09 2024 +0000

    build(deps): bump express from 4.18.2 to 4.19.2 in /react

    Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
    - [Release notes](https://github.com/expressjs/express/releases)
    - [Changelog](https://github.com/expressjs/express/blob/master/History.md)
    - [Commits](expressjs/express@4.18.2...4.19.2)

    ---
    updated-dependencies:
    - dependency-name: express
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit f6bc0e3
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat Mar 23 11:31:28 2024 +0000

    build(deps): bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /react

    Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
    - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
    - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
    - [Commits](webpack/webpack-dev-middleware@v5.3.3...v5.3.4)

    ---
    updated-dependencies:
    - dependency-name: webpack-dev-middleware
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit d07e5ff
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Mar 15 12:58:35 2024 +0000

    build(deps): bump follow-redirects from 1.14.8 to 1.15.6 in /react

    Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.8 to 1.15.6.
    - [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
    - [Commits](follow-redirects/follow-redirects@v1.14.8...v1.15.6)

    ---
    updated-dependencies:
    - dependency-name: follow-redirects
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 5816497
Merge: 3efd4eb be5b1cc
Author: Shao Yu-Lung (Allen) <bestlong168@gmail.com>
Date:   Fri Feb 23 00:28:41 2024 +0800

    Merge pull request laradock#3499 from erikn69/patch-24

    Fix MSSQL on PHP 8.0

commit 0f3affb
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Tue Feb 20 22:03:05 2024 +0000

    build(deps): bump ip from 2.0.0 to 2.0.1 in /react

    Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
    - [Commits](indutny/node-ip@v2.0.0...v2.0.1)

    ---
    updated-dependencies:
    - dependency-name: ip
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit be5b1cc
Author: erikn69 <erikn_69@hotmail.com>
Date:   Fri Feb 2 15:43:49 2024 -0500

    Fix MSSQL on PHP 8.0

commit 29c2b34
Author: erikn69 <erikn_69@hotmail.com>
Date:   Wed Jan 24 15:17:52 2024 -0500

    Customizable Soketi Server Version

commit 2004928
Author: DanielFloris <daniel@klika.com.au>
Date:   Fri Dec 15 11:45:06 2023 +1100

    updated documentation

commit b194d9a
Author: DanielFloris <daniel@klika.com.au>
Date:   Fri Dec 15 11:17:18 2023 +1100

    gh cli is installing on workspace

commit eee8891
Author: erikn69 <erikn_69@hotmail.com>
Date:   Thu Nov 23 11:44:48 2023 -0500

    Fix IONCUBE on Php 8.2
  • Loading branch information
@shnizmuffin
shnizmuffin committed May 3, 2024
1 parent 3a4185e commit a3c8aac
Show file tree
Hide file tree
Showing 8 changed files with 149 additions and 123 deletions.
3 changes: 3 additions & 0 deletions .env.example
View file
Expand Up @@ -223,6 +223,7 @@ WORKSPACE_INSTALL_DNSUTILS=true
WORKSPACE_XDEBUG_PORT=9000
WORKSPACE_VITE_PORT=5173
WORKSPACE_INSTALL_JDK=true
WORKSPACE_INSTALL_GITHUB_CLI=false

### PHP_FPM ###############################################

Expand Down Expand Up @@ -1072,6 +1073,8 @@ NATS_MONITORING_PORT=6222
NATS_ROUTE_PORT=8222

### SOKETI ##################################################
SOKETI_NODE_VERSION=16-debian
SOKETI_BASE_IMAGE_TAG_PREFIX=latest
SOKETI_PORT=6001
SOKETI_METRICS_SERVER_PORT=9601

Expand Down
35 changes: 35 additions & 0 deletions DOCUMENTATION/content/documentation/index.md
View file
Expand Up @@ -382,6 +382,41 @@ WORKSPACE_INSTALL_PHPDBG=true
PHP_FPM_INSTALL_PHPDBG=true
```

<br>
<a name="Install-github-copilot-cli"></a>
## Install Github Copilot Cli
### Note: You must have Github Copilot access to use this feature.
Install `gh-cli` in the Workspace Container:

<br>
1 - Open the `.env`.

2 - Search for `WORKSPACE_INSTALL_GITHUB_CLI`.

3 - Set value to `true`

```dotenv
WORKSPACE_INSTALL_GITHUB_CLI=true
```
4 - Re-build the containers `docker compose build workspace`

5 - start your container `docker compose up -d workspace // ..and all your other containers`

6 - Enter the Workspace container:
```bash
docker-compose exec workspace bash
```

7 - Authenticate with your github account and follow the instructions::
```bash
gh auth login
```

8 - Install the copilot cli:
```bash
gh extension install github/gh-copilot
```




Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yml
View file
Expand Up @@ -179,6 +179,7 @@ services:
- INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
- INSTALL_POPPLER_UTILS=${WORKSPACE_INSTALL_POPPLER_UTILS}
- INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
- INSTALL_GITHUB_CLI=${WORKSPACE_INSTALL_GITHUB_CLI}
- http_proxy
- https_proxy
- no_proxy
Expand Down Expand Up @@ -332,6 +333,7 @@ services:
- CHANGE_SOURCE=${CHANGE_SOURCE}
- LARADOCK_PHP_VERSION=${PHP_VERSION}
- PHALCON_VERSION=${PHALCON_VERSION}
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
- INSTALL_BZ2=${PHP_WORKER_INSTALL_BZ2}
- INSTALL_GD=${PHP_WORKER_INSTALL_GD}
- INSTALL_IMAGEMAGICK=${PHP_WORKER_INSTALL_IMAGEMAGICK}
Expand Down Expand Up @@ -419,6 +421,9 @@ services:
soketi:
build:
context: ./soketi
args:
- NODE_VERSION=${SOKETI_NODE_VERSION}
- BASE_IMAGE_TAG_PREFIX=${SOKETI_BASE_IMAGE_TAG_PREFIX}
volumes:
- ./soketi/config.json:/app/bin/config.json:ro
ports:
Expand Down
11 changes: 4 additions & 7 deletions php-fpm/Dockerfile
View file
Expand Up @@ -667,13 +667,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
ARG INSTALL_IONCUBE=false

RUN if [ ${INSTALL_IONCUBE} = true ]; then \
if [ ${LARADOCK_PHP_VERSION} = "8.1" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.4" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.3" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.2" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.1" ] \
|| [ ${LARADOCK_PHP_VERSION} = "7.0" ] \
|| [ ${LARADOCK_PHP_VERSION} = "5.6" ]; then \
if [ ${LARADOCK_PHP_VERSION} != "8.3" ] \
&& [ ${LARADOCK_PHP_VERSION} != "8.0" ]; then \
# Install the php ioncube loader
curl -L -o /tmp/ioncube_loaders_lin_x86-64.tar.gz https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz \
&& tar zxpf /tmp/ioncube_loaders_lin_x86-64.tar.gz -C /tmp \
Expand Down Expand Up @@ -790,6 +785,8 @@ RUN set -eux; \
pecl install pdo_sqlsrv-5.9.0 sqlsrv-5.9.0 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70400" ]; then \
pecl install pdo_sqlsrv-5.10.1 sqlsrv-5.10.1 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
pecl install pdo_sqlsrv-5.11.1 sqlsrv-5.11.1 \
;else \
pecl install pdo_sqlsrv sqlsrv \
;fi \
Expand Down
10 changes: 6 additions & 4 deletions php-worker/Dockerfile
View file
Expand Up @@ -348,11 +348,11 @@ ARG INSTALL_PHALCON=false
ARG LARADOCK_PHALCON_VERSION
ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}

RUN if [ $INSTALL_PHALCON = true ]; then \
apt-get update -yqq \
RUN if [ "$INSTALL_PHALCON" = true ]; then \
apk update \
&& pecl channel-update pecl.php.net \
&& apt-get install -yqq libpcre3-dev; \
pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
&& apk add --no-cache libpcre32 \
&& pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
docker-php-ext-enable phalcon; \
php -m | grep -q 'phalcon' \
;fi
Expand Down Expand Up @@ -539,6 +539,8 @@ RUN set -eux; \
pecl install pdo_sqlsrv-5.9.0 sqlsrv-5.9.0 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70400" ]; then \
pecl install pdo_sqlsrv-5.10.1 sqlsrv-5.10.1 \
;elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
pecl install pdo_sqlsrv-5.11.1 sqlsrv-5.11.1 \
;else \
pecl install pdo_sqlsrv sqlsrv \
;fi \
Expand Down

0 comments on commit a3c8aac

Please sign in to comment.