diff --git a/Dockerfile b/Dockerfile index 54190c5..c21b26a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/Makefile b/Makefile index 8620d6e..41e680c 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/docs/BUILDING.md b/docs/BUILDING.md index f18b061..bda5626 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -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 @@ -14,14 +14,14 @@ make image | 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 Available options: -* VERSION=4.2 +* VERSION=4.3 * TARGET=default Example: ```sh -make image-custom VERSION=4.2 +make image-custom VERSION=4.3 ``` diff --git a/docs/DOCKER-COMPOSE.md b/docs/DOCKER-COMPOSE.md index 61679b1..409ef39 100644 --- a/docs/DOCKER-COMPOSE.md +++ b/docs/DOCKER-COMPOSE.md @@ -13,7 +13,7 @@ make ## Options * NAMESPACE=chevereto -* VERSION=4.2 +* VERSION=4.3 * EDITION=pro * HTTP_PORT=80 * HTTPS_PORT=443 diff --git a/docs/LOGS.md b/docs/LOGS.md index f16814f..70eb398 100644 --- a/docs/LOGS.md +++ b/docs/LOGS.md @@ -8,7 +8,7 @@ make * 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. diff --git a/docs/PURE-DOCKER.md b/docs/PURE-DOCKER.md index 929ae7a..a89b203 100644 --- a/docs/PURE-DOCKER.md +++ b/docs/PURE-DOCKER.md @@ -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 diff --git a/docs/REPO-SYNCING.md b/docs/REPO-SYNCING.md index e81a5c6..42ee0f2 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.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 diff --git a/docs/UPGRADING.md b/docs/UPGRADING.md index 19f60d1..e1907d1 100644 --- a/docs/UPGRADING.md +++ b/docs/UPGRADING.md @@ -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