4.3 tiempos

This commit is contained in:
Rodolfo Berrios
2025-04-21 16:39:25 -04:00
parent a6ed97dd2e
commit c8fb1bbf6a
8 changed files with 20 additions and 20 deletions

View File

@@ -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.2
ARG VERSION=4.3
ARG SERVICING=docker
ENV CHEVERETO_ERROR_LOG=/dev/stderr \

View File

@@ -17,7 +17,7 @@ ifneq ("$(wildcard ${ENV_FILE})","")
endif
SOURCE ?= ~/git/chevereto/v4
TARGET ?= default# default|dev
VERSION ?= 4.2
VERSION ?= 4.3
PHP ?= 8.2
EDITION ?= $(shell [ "${CHEVERETO_LICENSE_KEY}" = "" ] && echo free || echo pro)
DOCKER_USER ?= www-data

View File

@@ -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.2.0`, `4.2` 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.3.0`, `4.3` and `4`.
```sh
make image <options>
@@ -14,14 +14,14 @@ make image <options>
| Option | Example | Description |
| ------- | ---------------- | ---------------------------- |
| VERSION | `VERSION=4.2` | System version (4.x) |
| VERSION | `VERSION=4.3` | 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.2
make image VERSION=4.3
```
### Notes on TARGET
@@ -30,9 +30,9 @@ Images will have a tag named following this convention:
| Target | Naming | Example |
| ------- | --------------------- | ----------------- |
| default | chevereto:VERSION | chevereto:4.2 |
| dev | chevereto-dev:VERSION | chevereto-dev:4.2 |
| any | chevereto-any:VERSION | chevereto-any:4.2 |
| default | chevereto:VERSION | chevereto:4.3 |
| dev | chevereto-dev:VERSION | chevereto-dev:4.3 |
| any | chevereto-any:VERSION | chevereto-any:4.3 |
## Make custom images
@@ -44,11 +44,11 @@ make image-custom <options>
Available options:
* VERSION=4.2
* VERSION=4.3
* TARGET=default
Example:
```sh
make image-custom VERSION=4.2
make image-custom VERSION=4.3
```

View File

@@ -13,7 +13,7 @@ make <command> <options>
## Options
* NAMESPACE=chevereto
* VERSION=4.2
* VERSION=4.3
* EDITION=pro
* HTTP_PORT=80
* HTTPS_PORT=443

View File

@@ -8,7 +8,7 @@ make <command> <options>
* NAMESPACE=yourproject
* SERVICE=php
* VERSION=4.2
* VERSION=4.3
(*) For `SERVICE` you can use `php` and `database` respectively to get the logs for the PHP Apache and the MariaDB database.

View File

@@ -29,8 +29,8 @@ By running the above command you will generate the following tags:
* `chevereto:latest`
* `chevereto:4`
* `chevereto:4.2`
* `chevereto:4.2.0`
* `chevereto:4.3`
* `chevereto:4.3.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.2) switch to that branch running the following command:
**Note:** If there's a new branch (for example 4.3) switch to that branch running the following command:
```sh
git switch 4.2
git switch 4.3
```
### Step 2: Re-build the container image

View File

@@ -17,7 +17,7 @@ make sync
If needed, switch to the new branch/tag.
```sh
git switch 4.2
git switch 4.3
```
## 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.2
git switch 4.3
```
## GitHub one-click repo updating

View File

@@ -10,10 +10,10 @@ Sync this repository to get the latest changes.
make sync
```
**Note:** If there's a new branch (for example 4.2) switch to that branch running the following command:
**Note:** If there's a new branch (for example 4.3) switch to that branch running the following command:
```sh
git switch 4.2
git switch 4.3
```
## Step 2: Re-build the container image