Skip to content

Commit

Permalink
Misc: Upgrade deps
Browse files Browse the repository at this point in the history
  • Loading branch information
richdynamix committed Dec 21, 2020
1 parent ffdd91e commit 0174da9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`

Expand All @@ -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
--- | --- | --- | ----
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions stubs/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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/*
Expand Down
4 changes: 2 additions & 2 deletions stubs/docker-compose-cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -42,7 +42,7 @@ services:

redis:
container_name: redis
image: digitonic1/redis3:latest
image: redis:latest
expose:
- 6379
ports:
Expand Down
4 changes: 2 additions & 2 deletions stubs/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -41,7 +41,7 @@ services:

redis:
container_name: redis
image: digitonic1/redis3:latest
image: redis:latest
expose:
- 6379
ports:
Expand Down

0 comments on commit 0174da9

Please sign in to comment.