Skip to content
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

Update rocket.chat #5590

Merged
merged 1 commit into from
Mar 22, 2019
Merged

Conversation

@tianon
Copy link
Member Author

tianon commented Mar 21, 2019

cc @geekgonecrazy is updating this to the -beta releases something we want to merge, or should we adjust update.sh to ignore those and wait for GA?

@geekgonecrazy
Copy link
Contributor

geekgonecrazy commented Mar 21, 2019

@tianon We for sure wouldn't want them available as the 1.0 tag nor the latest tag. I can just see the disaster unfold as people upgrade to a beta and all want to go back because running on a beta isn't something they want to do 😁

Might be easiest to just exclude beta / rc releases 🤔

@tianon
Copy link
Member Author

tianon commented Mar 22, 2019

Diff:
diff --git a/rocket.chat_latest/Dockerfile b/rocket.chat_latest/Dockerfile
index 685d09e..c843922 100644
--- a/rocket.chat_latest/Dockerfile
+++ b/rocket.chat_latest/Dockerfile
@@ -20,7 +20,7 @@ RUN set -eux; \
 ## End Hack
 
 ## Actual Rocket.Chat stuff
-MAINTAINER buildmaster@rocket.chat
+LABEL maintainer="buildmaster@rocket.chat"
 
 RUN groupadd -r rocketchat \
 &&  useradd -r -g rocketchat rocketchat \
diff --git a/rocket.chat_latest/Dockerfile.old b/rocket.chat_latest/Dockerfile.old
index c9aba1c..7c82437 100644
--- a/rocket.chat_latest/Dockerfile.old
+++ b/rocket.chat_latest/Dockerfile.old
@@ -1,7 +1,7 @@
 FROM node:8.11-slim
 
 # crafted and tuned by pierre@ozoux.net and sing.li@rocket.chat
-MAINTAINER buildmaster@rocket.chat
+LABEL maintainer="buildmaster@rocket.chat"
 
 RUN groupadd -r rocketchat \
 &&  useradd -r -g rocketchat rocketchat \

@tianon
Copy link
Member Author

tianon commented Mar 22, 2019

FYI, you probably want to adjust LABEL maintainer= to org.opencontainers.image.authors instead: https://github.com/opencontainers/image-spec/blob/v1.0.1/annotations.md

LGTM

Build test of #5590; e926f0e; amd64 (rocket.chat):

$ bashbrew build rocket.chat:0.74.3
Building bashbrew/cache:77c8292229fc9cf4c32d2796bbec1fa3b60f2a3d668d2b4b4298131c1d06dac0 (rocket.chat:0.74.3)
Tagging rocket.chat:0.74.3
Tagging rocket.chat:0.74
Tagging rocket.chat:0
Tagging rocket.chat:latest

$ test/run.sh rocket.chat:0.74.3
testing rocket.chat:0.74.3
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@geekgonecrazy
Copy link
Contributor

thanks for the heads up! Learn something new every day :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants