Merge ~barryprice/charm-k8s-discourse/+git/charm-k8s-discourse:master into charm-k8s-discourse:master

Proposed by Barry Price
Status: Merged
Approved by: Barry Price
Approved revision: d751ddcedb6eb00853b6b2caa2336a4b8230e1f2
Merged at revision: 653541eac6bff5c548fe9952cff22fa09b1a531a
Proposed branch: ~barryprice/charm-k8s-discourse/+git/charm-k8s-discourse:master
Merge into: charm-k8s-discourse:master
Diff against target: 41 lines (+4/-4)
3 files modified
Makefile (+1/-1)
config.yaml (+1/-1)
image/Dockerfile (+2/-2)
Reviewer Review Type Date Requested Status
prod-jenkaas-is (community) continuous-integration Needs Fixing
Tom Haddon Approve
Canonical IS Reviewers Pending
Review via email: mp+410934@code.launchpad.net

Commit message

Build 2.8.0.beta7 by default for CVE-2021-41163

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 653541eac6bff5c548fe9952cff22fa09b1a531a

Revision history for this message
prod-jenkaas-is (prod-jenkaas-is) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
prod-jenkaas-is (prod-jenkaas-is) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
prod-jenkaas-is (prod-jenkaas-is) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/Makefile b/Makefile
index 6a7bbe1..d754dab 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
1DISCOURSE_VERSION ?= v2.6.11DISCOURSE_VERSION ?= v2.8.0.beta7
2IMAGE_VERSION ?= $(DISCOURSE_VERSION)2IMAGE_VERSION ?= $(DISCOURSE_VERSION)
3IMAGE_NAME ?=discourse3IMAGE_NAME ?=discourse
44
diff --git a/config.yaml b/config.yaml
index 931dc5f..88f8ee8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,7 +2,7 @@ options:
2 discourse_image:2 discourse_image:
3 type: string3 type: string
4 description: "Discourse image to use"4 description: "Discourse image to use"
5 default: "discoursecharmers/discourse:v2.6.1"5 default: "discoursecharmers/discourse:v2.8.0.beta7"
6 image_user:6 image_user:
7 type: string7 type: string
8 description: "Private registry username"8 description: "Private registry username"
diff --git a/image/Dockerfile b/image/Dockerfile
index 94c4e1e..24fb59a 100644
--- a/image/Dockerfile
+++ b/image/Dockerfile
@@ -15,11 +15,11 @@ ARG CONTAINER_APP_GROUP
15ARG CONTAINER_APP_GID15ARG CONTAINER_APP_GID
1616
17# Used in Launchpad OCI Recipe build to tag the image.17# Used in Launchpad OCI Recipe build to tag the image.
18LABEL org.label-schema.version=${CONTAINER_APP_VERSION:-v2.6.1}18LABEL org.label-schema.version=${CONTAINER_APP_VERSION:-v2.8.0.beta7}
1919
20# Copy any args we got into the environment.20# Copy any args we got into the environment.
21ENV CONTAINER_APP_NAME ${CONTAINER_APP_NAME:-discourse}21ENV CONTAINER_APP_NAME ${CONTAINER_APP_NAME:-discourse}
22ENV CONTAINER_APP_VERSION ${CONTAINER_APP_VERSION:-v2.6.1}22ENV CONTAINER_APP_VERSION ${CONTAINER_APP_VERSION:-v2.8.0.beta7}
23ENV CONTAINER_APP_USERNAME ${CONTAINER_APP_USERNAME:-discourse}23ENV CONTAINER_APP_USERNAME ${CONTAINER_APP_USERNAME:-discourse}
24ENV CONTAINER_APP_UID ${CONTAINER_APP_UID:-200}24ENV CONTAINER_APP_UID ${CONTAINER_APP_UID:-200}
25ENV CONTAINER_APP_GROUP ${CONTAINER_APP_GROUP:-discourse}25ENV CONTAINER_APP_GROUP ${CONTAINER_APP_GROUP:-discourse}

Subscribers

People subscribed via source and target branches