diff options
| author | Davey Shafik <me@daveyshafik.com> | 2020-08-11 05:41:00 +0000 |
|---|---|---|
| committer | Davey Shafik <me@daveyshafik.com> | 2020-08-11 05:43:40 +0000 |
| commit | 49e3d00aba60325266ee12270417242ec898fbdf (patch) | |
| tree | 217fd14b816827f27837ecedf1d468c2a971e50d | |
| parent | faf80984bbba24f76ce66d3bf15d4628bddca63c (diff) | |
| download | php7-mysql-shim-49e3d00aba60325266ee12270417242ec898fbdf.zip php7-mysql-shim-49e3d00aba60325266ee12270417242ec898fbdf.tar.gz php7-mysql-shim-49e3d00aba60325266ee12270417242ec898fbdf.tar.bz2 | |
Update to include ext/mysqli and composer
| -rw-r--r-- | .devcontainer/Dockerfile | 6 | ||||
| -rw-r--r-- | .devcontainer/docker-compose.yml | 3 | ||||
| -rwxr-xr-x | .devcontainer/install-composer.sh | 17 |
3 files changed, 26 insertions, 0 deletions
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b8e9242..1882c80 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -7,6 +7,12 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ && apt-get install -y mariadb-client \ && apt-get clean -y && rm -rf /var/lib/apt/lists/* && rm -rf /tmp/library-scripts +# Install PHP Extensions +RUN docker-php-ext-install mysqli + +# Install Composer +RUN ./install-composer.sh + # Update args in docker-compose.yaml to set the UID/GID of the "vscode" user. ARG USER_UID=1000 ARG USER_GID=$USER_UID diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 8491159..ee5e7d4 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -27,6 +27,9 @@ services: # Overrides default command so things don't shut down after the process ends. command: sleep infinity + depends_on: + - mariadb + mariadb: image: mariadb:10.4 expose: diff --git a/.devcontainer/install-composer.sh b/.devcontainer/install-composer.sh new file mode 100755 index 0000000..ff40a28 --- /dev/null +++ b/.devcontainer/install-composer.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +EXPECTED_CHECKSUM="$(wget -q -O - https://composer.github.io/installer.sig)" +php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" +ACTUAL_CHECKSUM="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" + +if [ "$EXPECTED_CHECKSUM" != "$ACTUAL_CHECKSUM" ] +then + >&2 echo 'ERROR: Invalid installer checksum' + rm composer-setup.php + exit 1 +fi + +php composer-setup.php --install-dir=/usr/local/bin --filename=composer --quiet +RESULT=$? +rm composer-setup.php +exit $RESULT
\ No newline at end of file |