Merge pull request #6938 from RocketChat/test-ci

[NEW] Improve CI/Docker build/release

.docker/latest/Dockerfile → .docker/Dockerfile

 FROM rocketchat/base:4
 
-ENV RC_VERSION latest
+ENV RC_VERSION 0.56.0-rc.2
 
 MAINTAINER buildmaster@rocket.chat
 

.docker/develop/Dockerfile

-FROM rocketchat/base:4
-
-ENV RC_VERSION develop
-
-MAINTAINER buildmaster@rocket.chat
-
-RUN set -x \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
- && mkdir /app \
- && gpg --verify rocket.chat.tgz.asc \
- && mkdir -p /app \
- && tar -zxf rocket.chat.tgz -C /app \
- && rm rocket.chat.tgz rocket.chat.tgz.asc \
- && cd /app/bundle/programs/server \
- && npm install \
- && npm cache clear \
- && chown -R rocketchat:rocketchat /app
-
-USER rocketchat
-
-VOLUME /app/uploads
-
-WORKDIR /app/bundle
-
-# needs a mongoinstance - defaults to container linking with alias 'mongo'
-ENV DEPLOY_METHOD=docker \
-    NODE_ENV=production \
-    MONGO_URL=mongodb://mongo:27017/rocketchat \
-    MONGO_OPLOG_URL=mongodb://mongo:27017/local \
-    HOME=/tmp \
-    PORT=3000 \
-    ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads
-
-EXPOSE 3000
-
-CMD ["node", "main.js"]

.docker/release-candidate/Dockerfile

-FROM rocketchat/base:4
-
-ENV RC_VERSION release-candidate
-
-MAINTAINER buildmaster@rocket.chat
-
-RUN set -x \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/download" -o rocket.chat.tgz \
- && curl -SLf "https://rocket.chat/releases/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
- && mkdir /app \
- && gpg --verify rocket.chat.tgz.asc \
- && mkdir -p /app \
- && tar -zxf rocket.chat.tgz -C /app \
- && rm rocket.chat.tgz rocket.chat.tgz.asc \
- && cd /app/bundle/programs/server \
- && npm install \
- && npm cache clear \
- && chown -R rocketchat:rocketchat /app
-
-USER rocketchat
-
-VOLUME /app/uploads
-
-WORKDIR /app/bundle
-
-# needs a mongoinstance - defaults to container linking with alias 'mongo'
-ENV DEPLOY_METHOD=docker \
-    NODE_ENV=production \
-    MONGO_URL=mongodb://mongo:27017/rocketchat \
-    HOME=/tmp \
-    PORT=3000 \
-    ROOT_URL=http://localhost:3000 \
-    Accounts_AvatarStorePath=/app/uploads
-
-EXPOSE 3000
-
-CMD ["node", "main.js"]

.scripts/set-version.js

+/* eslint object-shorthand: 0, prefer-template: 0 */
+
+const path = require('path');
+const fs = require('fs');
+let pkgJson = {};
+
+try {
+	pkgJson = require(path.resolve(
+		process.cwd(),
+		'./package.json'
+	));
+} catch (err) {
+	console.error('no root package.json found');
+}
+
+const readline = require('readline');
+
+const rl = readline.createInterface({
+	input: process.stdin,
+	output: process.stdout
+});
+
+const files = [
+	'./package.json',
+	'./.sandstorm/sandstorm-pkgdef.capnp',
+	'./.travis/snap.sh',
+	'./.docker/Dockerfile.sh',
+	'./packages/rocketchat-lib/rocketchat.info'
+];
+
+console.log('Current version:', pkgJson.version);
+rl.question('New version: ', function(version) {
+	rl.close();
+
+	version = version.trim();
+
+	if (version === '') {
+		return;
+	}
+
+	console.log('Updating files to version ' + version);
+
+	files.forEach(function(file) {
+		const data = fs.readFileSync(file, 'utf8');
+
+		fs.writeFileSync(file, data.replace(pkgJson.version, version), 'utf8');
+	});
+});

.scripts/version.js

 /* eslint object-shorthand: 0, prefer-template: 0 */
 
 const path = require('path');
-const fs = require('fs');
-let pkgJson = {};
+var pkgJson = {};
 
 try {
 	pkgJson = require(path.resolve(
@@ -13,35 +12,4 @@ try {
 	console.error('no root package.json found');
 }
 
-const readline = require('readline');
-
-const rl = readline.createInterface({
-	input: process.stdin,
-	output: process.stdout
-});
-
-const files = [
-	'./package.json',
-	'./.sandstorm/sandstorm-pkgdef.capnp',
-	'./.travis/snap.sh',
-	'./packages/rocketchat-lib/rocketchat.info'
-];
-
-console.log('Current version:', pkgJson.version);
-rl.question('New version: ', function(version) {
-	rl.close();
-
-	version = version.trim();
-
-	if (version === '') {
-		return;
-	}
-
-	console.log('Updating files to version ' + version);
-
-	files.forEach(function(file) {
-		const data = fs.readFileSync(file, 'utf8');
-
-		fs.writeFileSync(file, data.replace(pkgJson.version, version), 'utf8');
-	});
-});
+console.log(pkgJson.version);

.travis.yml

@@ -5,7 +5,6 @@ services:
 branches:
   only:
   - develop
-  - release-candidate
   - "/^\\d+\\.\\d+\\.\\d+(-rc\\.\\d+)?$/"
 git:
   depth: 1

.travis/setartname.sh

-if [[ $TRAVIS_TAG ]]
- then
-  export ARTIFACT_NAME="$TRAVIS_TAG";
-else
-  export ARTIFACT_NAME="$TRAVIS_BRANCH";
-fi
+export ARTIFACT_NAME="$(meteor npm run version --silent)"

package.json

@@ -44,7 +44,8 @@
 		"chimp-test": "chimp tests/chimp-config.js",
 		"postinstall": "cd packages/rocketchat-katex && npm i",
 		"version": "node .scripts/version.js",
-		"release": "npm run version && conventional-changelog --config .github/changelog.js -i HISTORY.md -s"
+		"set-version": "node .scripts/set-version.js",
+		"release": "npm run set-version && conventional-changelog --config .github/changelog.js -i HISTORY.md -s"
 	},
 	"license": "MIT",
 	"repository": {