mirror of
https://github.com/chevereto/docker.git
synced 2026-02-02 20:39:04 +01:00
4.4
This commit is contained in:
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y \
|
||||
&& php -m \
|
||||
&& apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ARG VERSION=4.3
|
||||
ARG VERSION=4.4
|
||||
ARG SERVICING=docker
|
||||
|
||||
ENV CHEVERETO_ERROR_LOG=/dev/stderr \
|
||||
|
||||
@@ -4,7 +4,7 @@ Image building is **recommended** for Chevereto **paid edition**. If this is not
|
||||
|
||||
## Make image
|
||||
|
||||
This command creates the Docker image for Chevereto by downloading the software at `./chevereto` and then build from [Dockerfile](../Dockerfile). It will generate multiple semantic version tags `4.3.0`, `4.3` and `4`.
|
||||
This command creates the Docker image for Chevereto by downloading the software at `./chevereto` and then build from [Dockerfile](../Dockerfile). It will generate multiple semantic version tags `4.4.0`, `4.4` and `4`.
|
||||
|
||||
```sh
|
||||
make image <options>
|
||||
@@ -14,14 +14,14 @@ make image <options>
|
||||
|
||||
| Option | Example | Description |
|
||||
| ------- | ---------------- | ---------------------------- |
|
||||
| VERSION | `VERSION=4.3` | System version (4.x) |
|
||||
| VERSION | `VERSION=4.4` | System version (4.x) |
|
||||
| EDITION | `EDITION=pro` | System edition (pro,free) |
|
||||
| TARGET | `TARGET=default` | Image base name suffix (any) |
|
||||
|
||||
Example:
|
||||
|
||||
```sh
|
||||
make image VERSION=4.3
|
||||
make image VERSION=4.4
|
||||
```
|
||||
|
||||
### Notes on TARGET
|
||||
@@ -30,9 +30,9 @@ Images will have a tag named following this convention:
|
||||
|
||||
| Target | Naming | Example |
|
||||
| ------- | --------------------- | ----------------- |
|
||||
| default | chevereto:VERSION | chevereto:4.3 |
|
||||
| dev | chevereto-dev:VERSION | chevereto-dev:4.3 |
|
||||
| any | chevereto-any:VERSION | chevereto-any:4.3 |
|
||||
| default | chevereto:VERSION | chevereto:4.4 |
|
||||
| dev | chevereto-dev:VERSION | chevereto-dev:4.4 |
|
||||
| any | chevereto-any:VERSION | chevereto-any:4.4 |
|
||||
|
||||
## Make custom images
|
||||
|
||||
@@ -44,11 +44,11 @@ make image-custom <options>
|
||||
|
||||
Available options:
|
||||
|
||||
* VERSION=4.3
|
||||
* VERSION=4.4
|
||||
* TARGET=default
|
||||
|
||||
Example:
|
||||
|
||||
```sh
|
||||
make image-custom VERSION=4.3
|
||||
make image-custom VERSION=4.4
|
||||
```
|
||||
|
||||
@@ -15,7 +15,7 @@ make <command> <options>
|
||||
## Options
|
||||
|
||||
* NAMESPACE=chevereto
|
||||
* VERSION=4.3
|
||||
* VERSION=4.4
|
||||
* EDITION=pro
|
||||
* HTTP_PORT=80
|
||||
* HTTPS_PORT=443
|
||||
|
||||
@@ -8,7 +8,7 @@ make <command> <options>
|
||||
|
||||
* NAMESPACE=yourproject
|
||||
* SERVICE=php
|
||||
* VERSION=4.3
|
||||
* VERSION=4.4
|
||||
|
||||
(*) For `SERVICE` you can use `php` and `database` respectively to get the logs for the PHP Apache and the MariaDB database.
|
||||
|
||||
|
||||
@@ -29,8 +29,8 @@ By running the above command you will generate the following tags:
|
||||
|
||||
* `chevereto:latest`
|
||||
* `chevereto:4`
|
||||
* `chevereto:4.3`
|
||||
* `chevereto:4.3.0`
|
||||
* `chevereto:4.4`
|
||||
* `chevereto:4.4.0`
|
||||
|
||||
## Upgrading
|
||||
|
||||
@@ -44,10 +44,10 @@ Sync latest changes from [chevereto/docker](https://github.com/chevereto/docker)
|
||||
make sync
|
||||
```
|
||||
|
||||
**Note:** If there's a new branch (for example 4.3) switch to that branch running the following command:
|
||||
**Note:** If there's a new branch (for example 4.4) switch to that branch running the following command:
|
||||
|
||||
```sh
|
||||
git switch 4.3
|
||||
git switch 4.4
|
||||
```
|
||||
|
||||
### Step 2: Re-build the container image
|
||||
|
||||
@@ -17,7 +17,7 @@ make sync
|
||||
If needed, switch to the new branch/tag.
|
||||
|
||||
```sh
|
||||
git switch 4.3
|
||||
git switch 4.4
|
||||
```
|
||||
|
||||
## Manual repo updating
|
||||
@@ -31,7 +31,7 @@ git fetch --tags -f && git pull --rebase --autostash
|
||||
Then switch to the new branch/tag if needed.
|
||||
|
||||
```sh
|
||||
git switch 4.3
|
||||
git switch 4.4
|
||||
```
|
||||
|
||||
## GitHub one-click repo updating
|
||||
|
||||
@@ -10,10 +10,10 @@ Sync this repository to get the latest changes.
|
||||
make sync
|
||||
```
|
||||
|
||||
**Note:** If there's a new branch (for example 4.3) switch to that branch running the following command:
|
||||
**Note:** If there's a new branch (for example 4.4) switch to that branch running the following command:
|
||||
|
||||
```sh
|
||||
git switch 4.3
|
||||
git switch 4.4
|
||||
```
|
||||
|
||||
## Step 2: Re-build the container image
|
||||
|
||||
Reference in New Issue
Block a user