From d1d766b2cfe7963e292ca38771b81ce4e9e85a9a Mon Sep 17 00:00:00 2001 From: Rodolfo Berrios <20590102+rodber@users.noreply.github.com> Date: Mon, 1 Jul 2024 14:08:54 -0400 Subject: [PATCH] 4.2 regio tiempos --- Makefile | 2 +- docs/BUILDING.md | 16 ++++++++-------- docs/DOCKER-COMPOSE.md | 2 +- docs/LOGS.md | 2 +- docs/PURE-DOCKER.md | 4 ++-- docs/REPO-SYNCING.md | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 38c6a69..2baaa30 100644 --- a/Makefile +++ b/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 diff --git a/docs/BUILDING.md b/docs/BUILDING.md index 9a26fc8..03699f8 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -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 @@ -12,14 +12,14 @@ make image | 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 Available options: -* VERSION=4.1 +* VERSION=4.2 * TARGET=default Example: ```sh -make image-custom VERSION=4.1 +make image-custom VERSION=4.2 ``` diff --git a/docs/DOCKER-COMPOSE.md b/docs/DOCKER-COMPOSE.md index c4c5ba0..61679b1 100644 --- a/docs/DOCKER-COMPOSE.md +++ b/docs/DOCKER-COMPOSE.md @@ -13,7 +13,7 @@ make ## Options * NAMESPACE=chevereto -* VERSION=4.1 +* VERSION=4.2 * EDITION=pro * HTTP_PORT=80 * HTTPS_PORT=443 diff --git a/docs/LOGS.md b/docs/LOGS.md index 0addf1e..f16814f 100644 --- a/docs/LOGS.md +++ b/docs/LOGS.md @@ -8,7 +8,7 @@ make * 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. diff --git a/docs/PURE-DOCKER.md b/docs/PURE-DOCKER.md index 128007d..a325405 100644 --- a/docs/PURE-DOCKER.md +++ b/docs/PURE-DOCKER.md @@ -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 diff --git a/docs/REPO-SYNCING.md b/docs/REPO-SYNCING.md index b11b1dc..e81a5c6 100644 --- a/docs/REPO-SYNCING.md +++ b/docs/REPO-SYNCING.md @@ -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