Skip to content

Commit

Permalink
Release 24.04.1-2 - See CHANGELOG.md
Browse files Browse the repository at this point in the history
  • Loading branch information
tiredofit committed Apr 8, 2024
1 parent 1ce3732 commit cca3a97
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 24.04.1-2 2024-04-08 <dave at tiredofit dot ca>

### Added
- Collabora Office 24.04.1-2
- Collabora Online 24.04.1-2


## 23.05.10-1 2024-03-26 <dave at tiredofit dot ca>

### Added
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ ARG APP_NAME
ARG APP_BRAND

### Environment Variables
ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-23.05.10-1"} \
ENV COLLABORA_ONLINE_VERSION=${COLLABORA_ONLINE_VERSION:-"cp-24.04.1-2"} \
COLLABORA_ONLINE_REPO_URL=${COLLABORA_ONLINE_REPO_URL:-"https://github.com/CollaboraOnline/online"} \
#
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-23.05.10-1"} \
LIBREOFFICE_VERSION=${LIBREOFFICE_VERSION:-"cp-24.04.1-2"} \
LIBREOFFICE_REPO_URL=${LIBREOFFICE_REPO_URL:-"https://github.com/LibreOffice/core"} \
#
APP_NAME=${APP_NAME:-"Document Editor"} \
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,9 @@ The following image tags are available along with their tagged release based on

| Collabora Office version | Collabora Online version | Tag |
| ------------------------ | ------------------------ | ---------- |
| `2024` | `24.04.x` | `24.04.xx` |
| `2024` | `24.04.x` | `latest` |
| `2023` | `23.05.x` | `23.05.xx` |
| `2023` | `23.05.x` | `latest` |
| `2022` | `22.05.x` | `2.4.0` |
| `2021` | `21.11.0` | `2.3.0` |
| `6.4.x` | `6.4.x` | `2.1` |
Expand All @@ -102,8 +103,8 @@ Images are built primarily for `amd64` architecture, and may also include builds
## Configuration
### Quick Start

* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [docker-compose.yml](examples/compose.yml) that can be modified for development or production use.
* Set various [environment variables](#environment-variables) to understand the capabilities of this image. A Sample `docker-compose.yml` is provided that will work right out of the box for most people without any fancy optimizations.
* The quickest way to get started is using [docker-compose](https://docs.docker.com/compose/). See the examples folder for a working [compose.yml](examples/compose.yml) that can be modified for development or production use.
* Set various [environment variables](#environment-variables) to understand the capabilities of this image. A Sample `compose.yml` is provided that will work right out of the box for most people without any fancy optimizations.
* Map [persistent storage](#data-volumes) for access to configuration and data files for backup.
* Make sure you set your hostname e.g. online.example.com when starting your container to make sure the administration console urls are correct.

Expand Down

0 comments on commit cca3a97

Please sign in to comment.