mirror of
https://github.com/chevereto/docker.git
synced 2026-08-05 19:30:04 +02:00
4.2 regio tiempos
This commit is contained in:
2
Makefile
2
Makefile
@@ -17,7 +17,7 @@ ifneq ("$(wildcard ${ENV_FILE})","")
|
||||
endif
|
||||
SOURCE ?= ~/git/chevereto/v4
|
||||
TARGET ?= default# default|dev
|
||||
VERSION ?= 4.1
|
||||
VERSION ?= 4.2
|
||||
PHP ?= 8.2
|
||||
EDITION ?= $(shell [ "${CHEVERETO_LICENSE_KEY}" = "" ] && echo free || echo pro)
|
||||
DOCKER_USER ?= www-data
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
## 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.1.0`, `4.1` 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.2.0`, `4.2` and `4`.
|
||||
|
||||
```sh
|
||||
make image <options>
|
||||
@@ -12,14 +12,14 @@ make image <options>
|
||||
|
||||
| Option | Example | Description |
|
||||
| ------- | ---------------- | ---------------------------- |
|
||||
| VERSION | `VERSION=4.1` | System version (4.x) |
|
||||
| VERSION | `VERSION=4.2` | 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.1
|
||||
make image VERSION=4.2
|
||||
```
|
||||
|
||||
### Notes on TARGET
|
||||
@@ -28,9 +28,9 @@ Images will have a tag named following this convention:
|
||||
|
||||
| Target | Naming | Example |
|
||||
| ------- | --------------------- | ----------------- |
|
||||
| default | chevereto:VERSION | chevereto:4.1 |
|
||||
| dev | chevereto-dev:VERSION | chevereto-dev:4.1 |
|
||||
| any | chevereto-any:VERSION | chevereto-any:4.1 |
|
||||
| default | chevereto:VERSION | chevereto:4.2 |
|
||||
| dev | chevereto-dev:VERSION | chevereto-dev:4.2 |
|
||||
| any | chevereto-any:VERSION | chevereto-any:4.2 |
|
||||
|
||||
## Make custom images
|
||||
|
||||
@@ -42,11 +42,11 @@ make image-custom <options>
|
||||
|
||||
Available options:
|
||||
|
||||
* VERSION=4.1
|
||||
* VERSION=4.2
|
||||
* TARGET=default
|
||||
|
||||
Example:
|
||||
|
||||
```sh
|
||||
make image-custom VERSION=4.1
|
||||
make image-custom VERSION=4.2
|
||||
```
|
||||
|
||||
@@ -13,7 +13,7 @@ make <command> <options>
|
||||
## Options
|
||||
|
||||
* NAMESPACE=chevereto
|
||||
* VERSION=4.1
|
||||
* VERSION=4.2
|
||||
* EDITION=pro
|
||||
* HTTP_PORT=80
|
||||
* HTTPS_PORT=443
|
||||
|
||||
@@ -8,7 +8,7 @@ make <command> <options>
|
||||
|
||||
* NAMESPACE=yourproject
|
||||
* SERVICE=php
|
||||
* VERSION=4.1
|
||||
* VERSION=4.2
|
||||
|
||||
(*) For `SERVICE` you can use `php` and `database` respectively to get the logs for the PHP Apache and the MariaDB database.
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@ By running the above command you will generate the following tags:
|
||||
|
||||
* `chevereto:latest`
|
||||
* `chevereto:4`
|
||||
* `chevereto:4.1`
|
||||
* `chevereto:4.1.0`
|
||||
* `chevereto:4.2`
|
||||
* `chevereto:4.2.0`
|
||||
|
||||
## Upgrading
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ make sync
|
||||
If needed, switch to the new branch/tag.
|
||||
|
||||
```sh
|
||||
git switch 4.1
|
||||
git switch 4.2
|
||||
```
|
||||
|
||||
## 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.1
|
||||
git switch 4.2
|
||||
```
|
||||
|
||||
## GitHub one-click repo updating
|
||||
|
||||
Reference in New Issue
Block a user