diff --git a/README.md b/README.md index bade304..b79e2f4 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ Additionally - if selected, it can also add a Continuous Integration & Continuou The Docker configuration provides the following: -- PHP 7.3 (Configurable for 5.6, 7.0, 7.1, 7.2 & 7.3) +- PHP 7.4 (Configurable for 5.6, 7.0, 7.1, 7.2, 7.3, 7.4) - NodeJS 11 inc NPM - NGINX -- MySQL 5.7 -- REDIS 3 +- MySQL 8 +- REDIS 6 - ConfD templating - SupervisorD for process management - Configurable queue workers @@ -111,7 +111,7 @@ As part of the Arc configurations there is a simple bash script added to the roo ```bash ./ssh web ``` -This is simply a wrapper script for convenience. Under the hood its simply calling `docker exec -it web bash` +This is simply a wrapper script for convenience. Under the hood it's simply calling `docker exec -it web bash` Addtionally, you may swap the `web` argument for any of the container names i.e. `./ssh database`, `./ssh redis` @@ -124,10 +124,10 @@ ContinuousPipe Dockerfile offers an extremely flexible and solid infrastructure Rather that explain all the functions and environment variables available to Arc, it is easier to point you to the documentation for the parent images: -- [PHP NGINX](https://github.com/continuouspipe/dockerfiles/tree/master/php/nginx) - The direct parent of the Arc Docker file. By default it uses PHP 7.1 but you can change this within the Arc Dockerfile to match your needs. (Available versions are 5.6, 7.0 and 7.1) +- [PHP NGINX](https://github.com/continuouspipe/dockerfiles/tree/master/php/nginx) - The direct parent of the Arc Docker file. By default, it uses PHP 7.4, but you can change this within the Arc Dockerfile to match your needs. (Available versions are 5.6, 7.0, 7.1, 7.2, 7.3, 7.4) - [Ubuntu 16.04](https://github.com/continuouspipe/dockerfiles/tree/master/ubuntu/16.04) - This is the base image which the PHP image extends. This sets up all the ConfD and SupervisorD configuration. -To manipulate your environment you can add values for any of the environment variables for any of the above. Additionally there are a few specific to Arc which are all defined in `tools/docker/usr/local/share/env/20-arc-env`. +To manipulate your environment you can add values for any of the environment variables for any of the above. Additionally, there are a few specific to Arc which are all defined in `tools/docker/usr/local/share/env/20-arc-env`. Variable | Description | Expected values | Default --- | --- | --- | ---- @@ -138,7 +138,7 @@ COMPOSER_INSTALL_FLAGS | Allow the override of composer flags during installatio ## Credits -This package would not have been possible would it not have been for the amazing work of the ContinuousPipe team. Also a special thanks to Samuel for the introduction of ContinuousPipe and Kubernetes. His ability to teach Docker concepts has been of great value. A huge thanks to Kieren for his attention to detail and everlasting patience when helping me to understand the ContinuousPipe Dockerfiles and setup. +This package would not have been possible would it not have been for the amazing work of the ContinuousPipe team. Also, a special thanks to Samuel for the introduction of ContinuousPipe and Kubernetes. His ability to teach Docker concepts has been of great value. A huge thanks to Kieren for his attention to detail and everlasting patience when helping me to understand the ContinuousPipe Dockerfiles and setup. - [Samuel ROZE](https://github.com/sroze) - [Kieren Evans](https://github.com/kierenevans) diff --git a/stubs/Dockerfile b/stubs/Dockerfile index 015f3dd..57ba888 100644 --- a/stubs/Dockerfile +++ b/stubs/Dockerfile @@ -1,4 +1,4 @@ -FROM digitonic1/php7.3-nginx:latest +FROM digitonic1/php7.4-nginx:latest # Install node npm RUN curl -sL https://deb.nodesource.com/setup_11.x > /tmp/install-node.sh \ @@ -20,7 +20,7 @@ RUN curl -sL https://deb.nodesource.com/setup_11.x > /tmp/install-node.sh \ && npm rebuild node-sass \ \ # Clean the image \ - && apt-get remove -qq -y php7.2-dev pkg-config libmagickwand-dev build-essential \ + && apt-get remove -qq -y php7.4-dev pkg-config libmagickwand-dev build-essential \ && apt-get auto-remove -qq -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/stubs/docker-compose-cicd.yml b/stubs/docker-compose-cicd.yml index 61401dd..c356c15 100644 --- a/stubs/docker-compose-cicd.yml +++ b/stubs/docker-compose-cicd.yml @@ -28,7 +28,7 @@ services: database: container_name: database - image: digitonic1/mysql5.7:latest + image: digitonic1/mysql8:latest environment: MYSQL_ROOT_PASSWORD: arc MYSQL_DATABASE: arc @@ -42,7 +42,7 @@ services: redis: container_name: redis - image: digitonic1/redis3:latest + image: redis:latest expose: - 6379 ports: diff --git a/stubs/docker-compose.yml b/stubs/docker-compose.yml index ec3c6bd..ed69d84 100644 --- a/stubs/docker-compose.yml +++ b/stubs/docker-compose.yml @@ -27,7 +27,7 @@ services: database: container_name: database - image: digitonic1/mysql5.7:latest + image: digitonic1/mysql8.0:latest environment: MYSQL_ROOT_PASSWORD: arc MYSQL_DATABASE: arc @@ -41,7 +41,7 @@ services: redis: container_name: redis - image: digitonic1/redis3:latest + image: redis:latest expose: - 6379 ports: