-
Notifications
You must be signed in to change notification settings - Fork 2.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rocket.Chat: feat: Rocket.Chat 7.0.3 #17984
base: master
Are you sure you want to change the base?
Conversation
I'm sorry the confusion, I just saw the PR owner is not approved to run workflows in this repo yet (first contribution), that's why they didn't run. |
This comment has been minimized.
This comment has been minimized.
I'm sorry about the duplicated PRs, I'm automating the upgrade process for rocket.chat images and just merged the automation workflow, so it created this PR..
I'll close #17982 since once the v7 image is fixed, this PR should receive an update via the automation. |
61f944d
to
fa31ea9
Compare
This comment has been minimized.
This comment has been minimized.
fa31ea9
to
9c886c0
Compare
This comment has been minimized.
This comment has been minimized.
@tianon I think we're good to go |
A few notes:
|
@tianon I'll be doing the required changes at RocketChat/Docker.Official.Image#220 regarding the Deno installation, I've made a comment here RocketChat/Docker.Official.Image#220 (comment) where I've found that Deno checksums started being published only on v2, which is currently not supported by Rocket.Chat. is this a blocker? the Node version is not that strict anymore, while we officially ship Rocket.Chat v7.0 with Node 20.17, we can in theory ship it with Node 20.18 which the latest Node v20. |
Doh, sorry I missed that! I've been even more buried than normal so hadn't seen it yet. 😞 How often does Deno do new releases, especially on that older v1 series? Would it be reasonable to pre-calculate and embed some checksums? (Do you already have automation performing those bumps that makes that difficult?) On the Node version, I was thinking it might be advantageous for you to move back to being |
alright, so based on your suggestions, I've come up with: RocketChat/Docker.Official.Image#223 that addresses the following:
is that good? if so I'll move forward with that, which will then update this PR. |
In general that's good, but it looks like you've hard-coded the checksum for a single architecture, which will fail on any other architectures. 😅 |
9c886c0
to
05aee13
Compare
This comment has been minimized.
This comment has been minimized.
05aee13
to
819ade9
Compare
This comment has been minimized.
This comment has been minimized.
yeah, I'll fix that once we have multi architecture builds =) |
819ade9
to
7675c7d
Compare
Diff for 7675c7d:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6660df3..af3e40d 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,30 +1,31 @@
Maintainers: Rocket.Chat Image Team <buildmaster@rocket.chat> (@RocketChat)
GitRepo: https://github.com/RocketChat/Docker.Official.Image.git
-
-Tags: 6.8.7, 6.8
-GitCommit: 3a4113f1de4aa921dfe26c53f88b4d1f59fac3f5
-Directory: 6.8
+GitFetch: refs/heads/main
Tags: 6.9.7, 6.9
-GitCommit: 3a4113f1de4aa921dfe26c53f88b4d1f59fac3f5
+GitCommit: 2604071c1f2f2d4300262347a33c03bac25918fc
Directory: 6.9
-Tags: 6.10.7, 6.10
-GitCommit: 3a4113f1de4aa921dfe26c53f88b4d1f59fac3f5
+Tags: 6.10.9, 6.10
+GitCommit: 2604071c1f2f2d4300262347a33c03bac25918fc
Directory: 6.10
Tags: 6.11.3, 6.11
-GitCommit: 3a4113f1de4aa921dfe26c53f88b4d1f59fac3f5
+GitCommit: 2604071c1f2f2d4300262347a33c03bac25918fc
Directory: 6.11
-Tags: 6.12.2, 6.12
-GitCommit: 3a4113f1de4aa921dfe26c53f88b4d1f59fac3f5
+Tags: 6.12.3, 6.12
+GitCommit: 2604071c1f2f2d4300262347a33c03bac25918fc
Directory: 6.12
-Tags: 6.13.0, 6.13, 6
-GitCommit: 3a4113f1de4aa921dfe26c53f88b4d1f59fac3f5
+Tags: 6.13.1, 6.13, 6
+GitCommit: 2604071c1f2f2d4300262347a33c03bac25918fc
Directory: 6.13
-Tags: 7.0.0, 7.0, 7, latest
-GitCommit: 3a4113f1de4aa921dfe26c53f88b4d1f59fac3f5
+Tags: 7.0.3, 7.0
+GitCommit: 356c786113ce8c1f6b2cba6089737a4dc3eed78f
Directory: 7.0
+
+Tags: 7.1.0, 7.1, 7, latest
+GitCommit: 2604071c1f2f2d4300262347a33c03bac25918fc
+Directory: 7.1
diff --git a/_bashbrew-list b/_bashbrew-list
index e2a92ea..0ecda2e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,17 +1,17 @@
rocket.chat:6
-rocket.chat:6.8
-rocket.chat:6.8.7
rocket.chat:6.9
rocket.chat:6.9.7
rocket.chat:6.10
-rocket.chat:6.10.7
+rocket.chat:6.10.9
rocket.chat:6.11
rocket.chat:6.11.3
rocket.chat:6.12
-rocket.chat:6.12.2
+rocket.chat:6.12.3
rocket.chat:6.13
-rocket.chat:6.13.0
+rocket.chat:6.13.1
rocket.chat:7
rocket.chat:7.0
-rocket.chat:7.0.0
+rocket.chat:7.0.3
+rocket.chat:7.1
+rocket.chat:7.1.0
rocket.chat:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 68de09b..362ca44 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,7 +1,7 @@
rocket.chat:6
-rocket.chat:6.8
rocket.chat:6.9
rocket.chat:6.10
rocket.chat:6.11
rocket.chat:6.12
+rocket.chat:7.0
rocket.chat:latest
diff --git a/rocket.chat_6.10/Dockerfile b/rocket.chat_6.10/Dockerfile
index 26cce8b..f6b6621 100644
--- a/rocket.chat_6.10/Dockerfile
+++ b/rocket.chat_6.10/Dockerfile
@@ -1,8 +1,8 @@
FROM debian:bullseye-slim
## Installing Node.js
-ENV NODE_ENV production
-ENV NODE_VERSION 14.21.3
+ENV NODE_ENV=production
+ENV NODE_VERSION=14.21.3
# Node installation based on https://github.com/nodejs/docker-node/blob/66b46292a6e5dd5856b1d5204dc51547c80eb17a/12/buster-slim/Dockerfile
RUN ARCH="x64" \
@@ -48,10 +48,10 @@ RUN groupadd -r rocketchat \
VOLUME /app/uploads
-ENV RC_VERSION 6.10.7
-
WORKDIR /app
+ENV RC_VERSION=6.10.9
+
RUN set -eux \
&& apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
@@ -89,8 +89,7 @@ ENV DEPLOY_METHOD=docker-official \
MONGO_URL=mongodb://db:27017/meteor \
HOME=/tmp \
PORT=3000 \
- ROOT_URL=http://localhost:3000 \
- Accounts_AvatarStorePath=/app/uploads
+ ROOT_URL=http://localhost:3000
EXPOSE 3000
diff --git a/rocket.chat_6.11/Dockerfile b/rocket.chat_6.11/Dockerfile
index 637c316..49785d2 100644
--- a/rocket.chat_6.11/Dockerfile
+++ b/rocket.chat_6.11/Dockerfile
@@ -1,8 +1,8 @@
FROM debian:bullseye-slim
## Installing Node.js
-ENV NODE_ENV production
-ENV NODE_VERSION 14.21.3
+ENV NODE_ENV=production
+ENV NODE_VERSION=14.21.3
# Node installation based on https://github.com/nodejs/docker-node/blob/66b46292a6e5dd5856b1d5204dc51547c80eb17a/12/buster-slim/Dockerfile
RUN ARCH="x64" \
@@ -48,10 +48,10 @@ RUN groupadd -r rocketchat \
VOLUME /app/uploads
-ENV RC_VERSION 6.11.3
-
WORKDIR /app
+ENV RC_VERSION=6.11.3
+
RUN set -eux \
&& apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
@@ -89,8 +89,7 @@ ENV DEPLOY_METHOD=docker-official \
MONGO_URL=mongodb://db:27017/meteor \
HOME=/tmp \
PORT=3000 \
- ROOT_URL=http://localhost:3000 \
- Accounts_AvatarStorePath=/app/uploads
+ ROOT_URL=http://localhost:3000
EXPOSE 3000
diff --git a/rocket.chat_6.12/Dockerfile b/rocket.chat_6.12/Dockerfile
index 75cbbd9..61fd55f 100644
--- a/rocket.chat_6.12/Dockerfile
+++ b/rocket.chat_6.12/Dockerfile
@@ -1,8 +1,8 @@
FROM debian:bullseye-slim
## Installing Node.js
-ENV NODE_ENV production
-ENV NODE_VERSION 14.21.3
+ENV NODE_ENV=production
+ENV NODE_VERSION=14.21.3
# Node installation based on https://github.com/nodejs/docker-node/blob/66b46292a6e5dd5856b1d5204dc51547c80eb17a/12/buster-slim/Dockerfile
RUN ARCH="x64" \
@@ -48,10 +48,10 @@ RUN groupadd -r rocketchat \
VOLUME /app/uploads
-ENV RC_VERSION 6.12.2
-
WORKDIR /app
+ENV RC_VERSION=6.12.3
+
RUN set -eux \
&& apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
@@ -89,8 +89,7 @@ ENV DEPLOY_METHOD=docker-official \
MONGO_URL=mongodb://db:27017/meteor \
HOME=/tmp \
PORT=3000 \
- ROOT_URL=http://localhost:3000 \
- Accounts_AvatarStorePath=/app/uploads
+ ROOT_URL=http://localhost:3000
EXPOSE 3000
diff --git a/rocket.chat_6.9/Dockerfile b/rocket.chat_6.9/Dockerfile
index 913d732..9e28559 100644
--- a/rocket.chat_6.9/Dockerfile
+++ b/rocket.chat_6.9/Dockerfile
@@ -1,8 +1,8 @@
FROM debian:bullseye-slim
## Installing Node.js
-ENV NODE_ENV production
-ENV NODE_VERSION 14.21.3
+ENV NODE_ENV=production
+ENV NODE_VERSION=14.21.3
# Node installation based on https://github.com/nodejs/docker-node/blob/66b46292a6e5dd5856b1d5204dc51547c80eb17a/12/buster-slim/Dockerfile
RUN ARCH="x64" \
@@ -48,10 +48,10 @@ RUN groupadd -r rocketchat \
VOLUME /app/uploads
-ENV RC_VERSION 6.9.7
-
WORKDIR /app
+ENV RC_VERSION=6.9.7
+
RUN set -eux \
&& apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
@@ -89,8 +89,7 @@ ENV DEPLOY_METHOD=docker-official \
MONGO_URL=mongodb://db:27017/meteor \
HOME=/tmp \
PORT=3000 \
- ROOT_URL=http://localhost:3000 \
- Accounts_AvatarStorePath=/app/uploads
+ ROOT_URL=http://localhost:3000
EXPOSE 3000
diff --git a/rocket.chat_6/Dockerfile b/rocket.chat_6/Dockerfile
index 5f2f896..c49095b 100644
--- a/rocket.chat_6/Dockerfile
+++ b/rocket.chat_6/Dockerfile
@@ -1,8 +1,8 @@
FROM debian:bullseye-slim
## Installing Node.js
-ENV NODE_ENV production
-ENV NODE_VERSION 14.21.3
+ENV NODE_ENV=production
+ENV NODE_VERSION=14.21.3
# Node installation based on https://github.com/nodejs/docker-node/blob/66b46292a6e5dd5856b1d5204dc51547c80eb17a/12/buster-slim/Dockerfile
RUN ARCH="x64" \
@@ -48,10 +48,10 @@ RUN groupadd -r rocketchat \
VOLUME /app/uploads
-ENV RC_VERSION 6.13.0
-
WORKDIR /app
+ENV RC_VERSION=6.13.1
+
RUN set -eux \
&& apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
@@ -89,8 +89,7 @@ ENV DEPLOY_METHOD=docker-official \
MONGO_URL=mongodb://db:27017/meteor \
HOME=/tmp \
PORT=3000 \
- ROOT_URL=http://localhost:3000 \
- Accounts_AvatarStorePath=/app/uploads
+ ROOT_URL=http://localhost:3000
EXPOSE 3000
diff --git a/rocket.chat_6.8/Dockerfile b/rocket.chat_7.0/Dockerfile
similarity index 55%
rename from rocket.chat_6.8/Dockerfile
rename to rocket.chat_7.0/Dockerfile
index fc8f9a6..1dc30a6 100644
--- a/rocket.chat_6.8/Dockerfile
+++ b/rocket.chat_7.0/Dockerfile
@@ -1,36 +1,21 @@
-FROM debian:bullseye-slim
+FROM node:20-bookworm-slim
-## Installing Node.js
-ENV NODE_ENV production
-ENV NODE_VERSION 14.21.3
+ENV DENO_VERSION=1.37.1
-# Node installation based on https://github.com/nodejs/docker-node/blob/66b46292a6e5dd5856b1d5204dc51547c80eb17a/12/buster-slim/Dockerfile
-RUN ARCH="x64" \
- && set -eux \
- && apt-get update && apt-get install -y --no-install-recommends ca-certificates curl wget gnupg dirmngr xz-utils \
- && rm -rf /var/lib/apt/lists/* \
- && for key in \
- 4ED778F539E3634C779C87C6D7062848A1AB005C \
- 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
- 74F12602B6F1C4E913FAA37AD3A89613643B6201 \
- 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
- 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
- C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
- C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
- DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
- A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
- 108F52B48DB57BB0CC439B2997B01419BD92F80A \
- B9E2F5981AA6E0CD28160D9FF13993A75599653C \
- ; do \
- gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
- gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
- done \
- && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
- && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
- && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
- && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
- && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
+RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
+ && case "${dpkgArch##*-}" in \
+ amd64) ARCH='x86_64';; \
+ arm64) ARCH='aarch64';; \
+ *) echo "unsupported Deno architecture"; exit 1 ;; \
+ esac \
+ && set -ex \
+ && apt-get update && apt-get install -y --no-install-recommends ca-certificates curl unzip && rm -rf /var/lib/apt/lists/* \
+ && curl -fsSL https://dl.deno.land/release/v${DENO_VERSION}/deno-${ARCH}-unknown-linux-gnu.zip --output /tmp/deno-${ARCH}-unknown-linux-gnu.zip \
+ && echo "3ebb3c234c4ea5d914eb394af340e08ae0787e95ca8ec2c58b869752760faa00 /tmp/deno-x86_64-unknown-linux-gnu.zip" | sha256sum -c - \
+ && unzip /tmp/deno-${ARCH}-unknown-linux-gnu.zip -d /tmp \
+ && rm /tmp/deno-${ARCH}-unknown-linux-gnu.zip \
+ && chmod 755 /tmp/deno \
+ && mv /tmp/deno /usr/local/bin/deno \
&& apt-mark auto '.*' > /dev/null \
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { print $(NF-1) }' \
@@ -48,10 +33,12 @@ RUN groupadd -r rocketchat \
VOLUME /app/uploads
-ENV RC_VERSION 6.8.7
-
WORKDIR /app
+ENV NODE_ENV=production
+
+ENV RC_VERSION=7.0.3
+
RUN set -eux \
&& apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
@@ -89,8 +76,7 @@ ENV DEPLOY_METHOD=docker-official \
MONGO_URL=mongodb://db:27017/meteor \
HOME=/tmp \
PORT=3000 \
- ROOT_URL=http://localhost:3000 \
- Accounts_AvatarStorePath=/app/uploads
+ ROOT_URL=http://localhost:3000
EXPOSE 3000
diff --git a/rocket.chat_latest/Dockerfile b/rocket.chat_latest/Dockerfile
index 5674a5b..f59ad5f 100644
--- a/rocket.chat_latest/Dockerfile
+++ b/rocket.chat_latest/Dockerfile
@@ -1,52 +1,21 @@
-FROM debian:bookworm-slim
+FROM node:20-bookworm-slim
-## Installing Node.js
-ENV NODE_ENV production
-ENV NODE_VERSION 20.17.0
+ENV DENO_VERSION=1.37.1
-# Node installation based on https://github.com/nodejs/docker-node/blob/8483b3edd9cc2a38360d88d360e3093d657ac3fe/20/bookworm/Dockerfile
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
&& case "${dpkgArch##*-}" in \
- amd64) ARCH='x64';; \
- ppc64el) ARCH='ppc64le';; \
- s390x) ARCH='s390x';; \
- arm64) ARCH='arm64';; \
- armhf) ARCH='armv7l';; \
- i386) ARCH='x86';; \
- *) echo "unsupported architecture"; exit 1 ;; \
+ amd64) ARCH='x86_64';; \
+ arm64) ARCH='aarch64';; \
+ *) echo "unsupported Deno architecture"; exit 1 ;; \
esac \
- # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150
- && export GNUPGHOME="$(mktemp -d)" \
&& set -ex \
- && apt-get update && apt-get install -y --no-install-recommends ca-certificates curl wget gnupg dirmngr xz-utils && rm -rf /var/lib/apt/lists/* \
- # gpg keys listed at https://github.com/nodejs/node#release-keys
- && for key in \
- 4ED778F539E3634C779C87C6D7062848A1AB005C \
- 141F07595B7B3FFE74309A937405533BE57C7D57 \
- 74F12602B6F1C4E913FAA37AD3A89613643B6201 \
- DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \
- CC68F5A3106FF448322E48ED27F5E38D5B0A215F \
- 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
- 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \
- C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
- 108F52B48DB57BB0CC439B2997B01419BD92F80A \
- A363A499291CBBC940DD62E41F10027AF002F8B0 \
- ; do \
- gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \
- gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \
- done \
- && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \
- && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
- && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \
- && gpgconf --kill all \
- && rm -rf "$GNUPGHOME" \
- && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \
- && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
- && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \
- && ln -s /usr/local/bin/node /usr/local/bin/nodejs \
- # smoke tests
- && node --version \
- && npm --version \
+ && apt-get update && apt-get install -y --no-install-recommends ca-certificates curl unzip && rm -rf /var/lib/apt/lists/* \
+ && curl -fsSL https://dl.deno.land/release/v${DENO_VERSION}/deno-${ARCH}-unknown-linux-gnu.zip --output /tmp/deno-${ARCH}-unknown-linux-gnu.zip \
+ && echo "3ebb3c234c4ea5d914eb394af340e08ae0787e95ca8ec2c58b869752760faa00 /tmp/deno-x86_64-unknown-linux-gnu.zip" | sha256sum -c - \
+ && unzip /tmp/deno-${ARCH}-unknown-linux-gnu.zip -d /tmp \
+ && rm /tmp/deno-${ARCH}-unknown-linux-gnu.zip \
+ && chmod 755 /tmp/deno \
+ && mv /tmp/deno /usr/local/bin/deno \
&& apt-mark auto '.*' > /dev/null \
&& find /usr/local -type f -executable -exec ldd '{}' ';' \
| awk '/=>/ { print $(NF-1) }' \
@@ -64,10 +33,12 @@ RUN groupadd -r rocketchat \
VOLUME /app/uploads
-ENV RC_VERSION 7.0.0
-
WORKDIR /app
+ENV NODE_ENV=production
+
+ENV RC_VERSION=7.1.0
+
RUN set -eux \
&& apt-get update \
&& apt-get install -y --no-install-recommends fontconfig \
@@ -105,8 +76,7 @@ ENV DEPLOY_METHOD=docker-official \
MONGO_URL=mongodb://db:27017/meteor \
HOME=/tmp \
PORT=3000 \
- ROOT_URL=http://localhost:3000 \
- Accounts_AvatarStorePath=/app/uploads
+ ROOT_URL=http://localhost:3000
EXPOSE 3000 Relevant Maintainers:
|
hi @tianon , I think we're good here.. pls lmk if there is anything missing from our side |
Pull Request: RocketChat/Docker.Official.Image#225