From 9a2c9ac30c36d3872072e5661f7b7542ffbcff12 Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Fri, 22 Dec 2023 13:09:38 +0000 Subject: [PATCH 1/4] add --pull to avoid errors with outdated image --- docs/installation-and-operations/installation/docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/installation-and-operations/installation/docker/README.md b/docs/installation-and-operations/installation/docker/README.md index 429019ee3bc7..e2d516c1bf83 100644 --- a/docs/installation-and-operations/installation/docker/README.md +++ b/docs/installation-and-operations/installation/docker/README.md @@ -450,7 +450,7 @@ All the Dockerfile does is copy your custom plugins gemfile into the image, inst To actually build the docker image run: ```shell -docker build -t openproject-with-slack . +docker build --pull -t openproject-with-slack . ``` The `-t` option is the tag for your image. You can choose what ever you want. From 8fd1f4b193f745165dfc0eb61da83cffaaa0cb3d Mon Sep 17 00:00:00 2001 From: Markus Kahl Date: Fri, 22 Dec 2023 13:42:37 +0000 Subject: [PATCH 2/4] add instructions on how to add plugins to the slim image --- .../installation/docker/README.md | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/docs/installation-and-operations/installation/docker/README.md b/docs/installation-and-operations/installation/docker/README.md index e2d516c1bf83..1e79f80b65e3 100644 --- a/docs/installation-and-operations/installation/docker/README.md +++ b/docs/installation-and-operations/installation/docker/README.md @@ -445,6 +445,37 @@ RUN ./docker/prod/setup/postinstall.sh The file is based on the normal OpenProject docker image. All the Dockerfile does is copy your custom plugins gemfile into the image, install the gems and precompile any new assets. +**slim image** + +If you are using the `-slim` tag you will need to do the following to add your plugin. + +``` +FROM openproject/community:13 AS plugin + +# If installing a local plugin (using `path:` in the `Gemfile.plugins` above), +# you will have to copy the plugin code into the container here and use the +# path inside of the container. Say for `/app/vendor/plugins/openproject-slack`: +# COPY /path/to/my/local/openproject-slack /app/vendor/plugins/openproject-slack + +COPY Gemfile.plugins /app/ + +# If the plugin uses any external NPM dependencies you have to install them here. +# RUN npm add npm * + +RUN bundle config unset deployment && bundle install && bundle config set deployment 'true' +RUN ./docker/prod/setup/postinstall.sh + +FROM openproject/community:13-slim + +COPY --from=plugin /usr/bin/git /usr/bin/git +COPY --chown=$APP_USER:$APP_USER --from=plugin /app/vendor/bundle /app/vendor/bundle +COPY --chown=$APP_USER:$APP_USER --from=plugin /usr/local/bundle /usr/local/bundle +COPY --chown=$APP_USER:$APP_USER --from=plugin /app/public/assets /app/public/assets +COPY --chown=$APP_USER:$APP_USER --from=plugin /app/config/frontend_assets.manifest.json /app/config/frontend_assets.manifest.json +COPY --chown=$APP_USER:$APP_USER --from=plugin /app/Gemfile.* /app/ + +``` + **4. Build the image** To actually build the docker image run: From 92a708e86432dd7a2c2f4f8a0400e7e20dc59055 Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 22 Dec 2023 15:04:34 +0100 Subject: [PATCH 3/4] Add release-notes file --- docs/release-notes/13-1-2/README.md | 25 +++++++++++++++++++++++++ docs/release-notes/README.md | 7 +++++++ 2 files changed, 32 insertions(+) create mode 100644 docs/release-notes/13-1-2/README.md diff --git a/docs/release-notes/13-1-2/README.md b/docs/release-notes/13-1-2/README.md new file mode 100644 index 000000000000..6c0911b5fdcf --- /dev/null +++ b/docs/release-notes/13-1-2/README.md @@ -0,0 +1,25 @@ +--- +title: OpenProject 13.1.2 +sidebar_navigation: + title: 13.1.2 +release_version: 13.1.2 +release_date: 2023-12-22 +--- + +# OpenProject 13.1.2 + +Release date: 2023-12-22 + +We released [OpenProject 13.1.2](https://community.openproject.com/versions/1982). +The release contains several bug fixes and we recommend updating to the newest version. + + + +## Bug fixes and changes + + + +- Fixed: Unnecessary bullet displayed for TODO checkboxes in wp comments \[[#45469](https://community.openproject.com/wp/45469)\] +- Fixed: Black text invisible on some darker colors in the Task modal of the Task board \[[#49934](https://community.openproject.com/wp/49934)\] +- Fixed: White space at the end of page when scrolling a wiki page \[[#51680](https://community.openproject.com/wp/51680)\] +- Fixed: Migration from 12.x to 13.1 fails for installations already having file links in the database \[[#51801](https://community.openproject.com/wp/51801)\] diff --git a/docs/release-notes/README.md b/docs/release-notes/README.md index 5b51f441d537..3b88caaad4bf 100644 --- a/docs/release-notes/README.md +++ b/docs/release-notes/README.md @@ -14,6 +14,13 @@ Stay up to date and get an overview of the new features included in the releases +## 13.1.2 + +Release date: 2023-12-22 + +[Release Notes](13-1-2/) + + ## 13.1.1 Release date: 2023-12-20 From 654461ff0881e72c28a4a2e69304ae0578a3a97c Mon Sep 17 00:00:00 2001 From: ulferts Date: Fri, 22 Dec 2023 15:04:34 +0100 Subject: [PATCH 4/4] Bumped version to 13.1.3 [ci skip] --- lib/open_project/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/version.rb b/lib/open_project/version.rb index 7e6ccf499651..3688c32aefe8 100644 --- a/lib/open_project/version.rb +++ b/lib/open_project/version.rb @@ -33,7 +33,7 @@ module OpenProject module VERSION # :nodoc: MAJOR = 13 MINOR = 1 - PATCH = 2 + PATCH = 3 class << self # Used by semver to define the special version (if any).