Added Docker push postpublish script #1397

rishivikram · 2018-01-24T20:17:04Z

No description provided.

… alpine33. Also updated the docker files to install the root newman directory as a nodejs module which would be used by the docker image

… is sent to the docker daemon

… and pushes the image on docker hub

…ript once the build is successful

kunagpal

@rishivikram Ensure that all applicable statements are terminated with a semicolon.

kunagpal · 2018-01-24T20:33:59Z

docker/images/ubuntu1404/README.md

@@ -0,0 +1,38 @@
+# newman_ubuntu1404
+
+This image runs newman 3.9.0 on node 4.3.0 on Ubuntu 14.04.2


Remove the Newman version from this statement, mention the Node version as 8.

kunagpal · 2018-01-24T20:34:33Z

docker/images/ubuntu1404/README.md

+Or get it from [docker hub](https://registry.hub.docker.com/u/postman/newman_ubuntu1404/)
+
+```terminal
+docker pull postman/newman_ubuntu1404:3.9.0


Same as above.

kunagpal · 2018-01-24T20:37:43Z

docker/scripts/run.sh

+	fi
+}
+
+NODE_V=$(node -v | grep -o "v.")


Travis provides an inbuilt environment variable for this, use that instead.

kunagpal · 2018-01-24T20:38:31Z

docker/scripts/run.sh

+NODE_V=$(node -v | grep -o "v.")
+
+IMAGES_BASE_PATH="./docker/images"
+if [ -n "$TRAVIS_TAG" ] && [ "$NODE_V" = "v8" ]; then


This will cause unstable tags to be built as well.

kunagpal · 2018-01-24T20:42:11Z

docker/scripts/run.sh

+	docker build -t "$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG" .
+	if docker images | grep -q "$DOCKER_ID_USER/$IMAGE_NAME"; then
+		echo "Image built"
+		if docker run -t "$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG" run "https://www.getpostman.com/collections/8a0c9bc08f062d12dcda"; then


This will fail if the link ever dies, use a local collection file instead.

kunagpal · 2018-01-24T20:43:48Z

docker/scripts/run.sh

+		if docker run -t "$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG" run "https://www.getpostman.com/collections/8a0c9bc08f062d12dcda"; then
+			echo "Collection run successfully"
+			docker login -u "$DOCKER_ID_USER" -p "$DOCKER_ID_PASSWORD"
+			docker push "$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG"


This needs the latest tag as well.

kunagpal · 2018-01-24T20:45:06Z

docker/scripts/run.sh

+function build_docker_image {
+    BASENAME=$(basename $1)
+    IMAGE_NAME="newman_$BASENAME"
+	docker build -t "$DOCKER_ID_USER/$IMAGE_NAME:$TRAVIS_TAG" .


Indentation is off.

kunagpal · 2018-01-24T20:46:11Z

docker/scripts/run.sh

+			echo "Collection not run successfully"
+		fi
+	else
+		echo "Image not built"


Also include the image basename in the message.

kunagpal · 2018-01-24T20:48:09Z

docker/images/alpine33/Dockerfile

+MAINTAINER Postman Labs <help@getpostman.com>
+
+# Set node version
+# Can't upgrade to nodev8 because it isn't supported in alpine 3.3


kunagpal · 2018-01-24T20:49:28Z

docker/images/alpine33/README.md

@@ -0,0 +1,38 @@
+# newman_alpine33
+
+This image runs newman 3.9.0 on node 4.3.0 on Alpine 3.3


Remove the Newman version, update the Node version to v4.3.2

…nly docker images for stable TRAVIS_TAGS will be built

kunagpal · 2018-01-25T09:10:41Z

docker/scripts/run.sh

+    BASENAME=$(basename $1);
+    IMAGE_NAME="newman_$BASENAME";
+    TAG="$2";
+    docker build -t "$DOCKER_ID_USER/$IMAGE_NAME:$TAG" .


You'll have to add the latest tag here (-t can accept multiple space separated name:value parameters). See https://github.com/postmanlabs/newman-docker/blob/develop/scripts/docker/docker-build.sh#L13 for a working example.

kunagpal · 2018-01-25T09:10:53Z

docker/scripts/run.sh

+        if [ -d "${image}" ] && [ -f "${image}/Dockerfile" ]; then
+            cp "${image}/Dockerfile" .
+            build_docker_image ${image} ${TRAVIS_TAG};
+            build_docker_image ${image} "latest";


You don't have to build two separate images, supply multiple tags as explained above. 😓

Sorry, will correct it right away.

kunagpal · 2018-01-25T09:11:36Z

docker/scripts/run.sh

+    docker build -t "$DOCKER_ID_USER/$IMAGE_NAME:$TAG" .
+    if docker images | grep -q "$DOCKER_ID_USER/$IMAGE_NAME"; then
+        echo "Image built"
+        if docker run -t "$DOCKER_ID_USER/$IMAGE_NAME:$TAG" run "sample-collection.json"; then


Don't you have to specify the complete path, as in examples/sample-collection.json?

In this case, I already mounted the whole examples directory in etc/newman, so no need. The collection runs correctly.

I did the mounting work in the dockerfile.

kunagpal · 2018-01-25T09:26:35Z

docker/scripts/run.sh

+EXTRACTED_TAG=$(echo $TRAVIS_TAG | grep -o "[0-9]\+.[0-9]\+.[0-9]\+")
+if [ -n "$TRAVIS_TAG" ] && [ "$TRAVIS_TAG" = "$EXTRACTED_TAG" ] && [ "$TRAVIS_NODE_VERSION" = "8" ]; then
+    for image in $IMAGES_BASE_PATH/*; do
+        if [ -d "${image}" ] && [ -f "${image}/Dockerfile" ]; then


The -d conditional check is redundant here.

kunagpal · 2018-01-29T05:31:24Z

docker/images/alpine33/Dockerfile

+
+ADD . /newman
+
+RUN ln -s /newman/examples /etc/newman


Avoid creating symlinks here, use the complete path in collection run tests in the build script.

kunagpal · 2018-01-29T05:31:36Z

docker/images/ubuntu1404/Dockerfile

+
+ADD . /newman
+
+RUN ln -s /newman/examples /etc/newman


Same as above.

…in package.json

… is taken from package.json after it has been released

…n package.json can recognize it

…ctly now and doesn't throw a GPG public key error

…t in the npm folder

…on-bump

kunagpal · 2018-01-31T12:57:36Z

test/system/repository.test.js

                });
            });

            it('must have the hashbang defined', function () {
                json.scripts && Object.keys(json.scripts).forEach(function (scriptName) {
-                    var fileContent = fs.readFileSync('npm/' + scriptName + '.js').toString();
-                    expect(/^#!\/(bin\/bash|usr\/bin\/env\snode)[\r\n][\W\w]*$/g.test(fileContent)).to.be.ok();
+                    fs.readFile('npm/' + scriptName + '.js', function (err, fileContent) {


No. Check if the file is a shell script or js file using fs.stat first, and then perform extension specific checks.

kunagpal · 2018-01-31T12:58:14Z

test/system/repository.test.js

-                var scriptRegex = /^node\snpm\/.+\.js$/;
-
+                var scriptRegexJS = /^node\snpm\/.+\.js$/,
+                    scriptRegexSH = /^\.\/npm\/.+\.sh$/;


Have one cumulative regex testing both patterns.

kunagpal · 2018-01-31T12:59:05Z

docker/images/ubuntu1404/Dockerfile

+RUN npm install -g n;
+RUN n ${NODE_VERSION};
+
+ARG newman_version=default_value


It needs a default value which would be used if $newman_version is not sent as a variable in the docker build command.

kunagpal · 2018-01-31T12:59:21Z

docker/images/alpine33/Dockerfile

+# Install node
+RUN apk add --update nodejs=${NODE_VERSION}-r1;
+
+ARG newman_version=default_value


…thub.com:rishivikram/newman into feature/automate-newman-dockerimage-version-bump Pulled latest code from github.

…ted the DOCKER_ID_USER and DOCKER_ID_PASSWORD environment variables to DOCKER_USER and DOCKER_PASSWORD respectively

…on-bump

sheluchin · 2018-03-02T20:14:42Z

Looking for updated Docker images and this might be the shortest path there. Is this going to continue through the review process? Perhaps we can get updated images created manually if this isn't going to get merged anytime soon?

guessi

@rishivikram FYI,
maybe you would like to see my PR at another repository:

newman-docker - Pull Request 89

guessi · 2018-03-12T06:04:28Z

docker/images/ubuntu1404/Dockerfile

+
+RUN apt-get install -y curl;
+
+RUN curl -sS https://deb.nodesource.com/setup_8.x | sudo -E bash -


no need to install curl, it could be replaced by Docker build-in ADD feature
FYI, https://github.com/postmanlabs/newman-docker/pull/89/files#diff-df82f574da54a99527d80ff59fdf5388R10

guessi · 2018-03-12T06:04:55Z

docker/images/ubuntu1404/Dockerfile

@@ -0,0 +1,49 @@
+FROM ubuntu:14.04.2


Better to use ubuntu:14.04 to keep track on upstream changes

guessi · 2018-03-12T06:05:30Z

docker/images/ubuntu1404/Dockerfile

+
+RUN curl -sS https://deb.nodesource.com/setup_8.x | sudo -E bash -
+
+RUN apt-get clean && apt-get upgrade -y && apt-get update -y --fix-missing && apt-get install -y nodejs


should avoid upgrade inside docker, use FROM ubuntu:14.04 instead

guessi · 2018-03-12T07:07:32Z

docker/images/ubuntu1404/README.md

+docker build -t postman/newman_ubuntu1404 .
+```
+
+Or get it from [docker hub](https://registry.hub.docker.com/u/postman/newman_ubuntu1404/)


please update the path on the Docker Hub

https://hub.docker.com/r/postman/newman_ubuntu1404/

* Added alpine linux repository reference for correct dependency installation * Compacted multiple ENV statements * Added validation for build-args

* Switched to installing Node from the debian nodesource repository * Compacted multiple ENV statements * Added validation for build-args

* Added validation, coloured output * Added steps to autopublish the built images * Updated docker build command to work without caching, remove intermediate image layers

…on-bump

liyinchigithub · 2018-11-13T06:16:20Z

deprecation ！why？

kunagpal · 2018-11-13T06:18:07Z

@liyinchigithub This has now been replaced with https://hub.docker.com/r/postman/newman, which has all tags under one unified repository.

liyinchigithub · 2018-11-13T06:24:00Z

I see, thank you

rishivikram added 5 commits January 25, 2018 01:06

Added docker folder that contains the docker files for ubuntu1404 and…

9617f0c

… alpine33. Also updated the docker files to install the root newman directory as a nodejs module which would be used by the docker image

Added .dockerignore file so that not everything (like nodejs modules)…

1c4f156

… is sent to the docker daemon

Added the main script that runs after successful tag build on newman,…

e6d1d1f

… and pushes the image on docker hub

Added after_success routine to trigger the ./docker/scripts/run.sh sc…

6965ca9

…ript once the build is successful

Removed unnecessary echo statements

7556c24

kunagpal self-requested a review January 24, 2018 20:31

kunagpal self-assigned this Jan 24, 2018

rishivikram changed the title ~~[NEWMAN-133] Automate newman docker image version bumps after successful tag build on master branch of newman~~ Automate newman docker image version bumps after successful tag build on master branch of newman Jan 24, 2018

kunagpal added enhancement docker labels Jan 24, 2018

kunagpal suggested changes Jan 24, 2018

View reviewed changes

rishivikram added 2 commits January 25, 2018 03:50

Updated Dockerfile so that local collections can run now

6de27b5

Used travis environment variables to determine the node version and o…

316a4b3

…nly docker images for stable TRAVIS_TAGS will be built

kunagpal suggested changes Jan 25, 2018

View reviewed changes

Updated docker build command to include the latest tag

28b3a39

kunagpal suggested changes Jan 29, 2018

View reviewed changes

rishivikram and others added 6 commits January 30, 2018 12:51

Removed after success routine from .travis.yml and added postpublish …

fadfdb8

…in package.json

Updated dockerfiles and script so that newman version to be installed…

d714412

… is taken from package.json after it has been released

Renamed the run.sh script and moved it to npm folder so that script i…

7378d20

…n package.json can recognize it

Added options to apt-get update so that the docker image builds corre…

46b9c79

…ctly now and doesn't throw a GPG public key error

Updated repository.test.js to account for .sh files also being presen…

ffb0902

…t in the npm folder

Merge branch 'develop' into feature/automate-newman-dockerimage-versi…

74f29bf

…on-bump

kunagpal suggested changes Jan 31, 2018

View reviewed changes

rishivikram and others added 4 commits January 31, 2018 20:22

Made the code in system tests a little cleaner

74a7862

Merge branch 'feature/automate-newman-dockerimage-version-bump' of gi…

213a7c6

…thub.com:rishivikram/newman into feature/automate-newman-dockerimage-version-bump Pulled latest code from github.

Updated the dockerfile to not use a fallback default value. Also upda…

c7747b6

…ted the DOCKER_ID_USER and DOCKER_ID_PASSWORD environment variables to DOCKER_USER and DOCKER_PASSWORD respectively

Merge branch 'develop' into feature/automate-newman-dockerimage-versi…

806474d

…on-bump

kunagpal mentioned this pull request Mar 11, 2018

Docker best practice postmanlabs/newman-docker#89

Closed

guessi reviewed Mar 12, 2018

View reviewed changes

kunagpal and others added 5 commits May 8, 2018 15:33

Updated Newman alpine 3.3 Dockerfile for automated postpublish

099b659

* Added alpine linux repository reference for correct dependency installation * Compacted multiple ENV statements * Added validation for build-args

Updated Newman alpine 3.3 Dockerfile for automated postpublish

10b4b15

* Switched to installing Node from the debian nodesource repository * Compacted multiple ENV statements * Added validation for build-args

Cleaned up postpublish script 🎨

da2e1ec

* Added validation, coloured output * Added steps to autopublish the built images * Updated docker build command to work without caching, remove intermediate image layers

Merge branch 'develop' into feature/automate-newman-dockerimage-versi…

9a45abe

…on-bump

Fixed broken system tests ✅

fd73890

kunagpal changed the title ~~Automate newman docker image version bumps after successful tag build on master branch of newman~~ Added Docker push postpublish script May 8, 2018

kunagpal approved these changes May 8, 2018

View reviewed changes

kunagpal merged commit 29f51b5 into postmanlabs:develop May 8, 2018

kunagpal mentioned this pull request May 9, 2018

Proposal: Find / write a bot for automated Newman version bumps postmanlabs/newman-docker#34

Closed

kunagpal mentioned this pull request May 31, 2018

Added deprecation notice postmanlabs/newman-docker#97

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Docker push postpublish script #1397

Added Docker push postpublish script #1397

rishivikram commented Jan 24, 2018 •

edited

Loading

kunagpal left a comment

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 24, 2018

kunagpal Jan 25, 2018

kunagpal Jan 25, 2018

rishivikram Jan 25, 2018

kunagpal Jan 25, 2018

rishivikram Jan 25, 2018

rishivikram Jan 25, 2018

kunagpal Jan 25, 2018

kunagpal Jan 29, 2018

kunagpal Jan 29, 2018

kunagpal Jan 31, 2018

kunagpal Jan 31, 2018

kunagpal Jan 31, 2018

rishivikram Jan 31, 2018

kunagpal Jan 31, 2018

sheluchin commented Mar 2, 2018

guessi left a comment

guessi Mar 12, 2018

guessi Mar 12, 2018

guessi Mar 12, 2018

guessi Mar 12, 2018

liyinchigithub commented Nov 13, 2018

kunagpal commented Nov 13, 2018 •

edited

Loading

liyinchigithub commented Nov 13, 2018

		@@ -0,0 +1,38 @@
		# newman_ubuntu1404

		This image runs newman 3.9.0 on node 4.3.0 on Ubuntu 14.04.2

		@@ -0,0 +1,38 @@
		# newman_alpine33

		This image runs newman 3.9.0 on node 4.3.0 on Alpine 3.3


		RUN apt-get install -y curl;

		RUN curl -sS https://deb.nodesource.com/setup_8.x \| sudo -E bash -


		RUN curl -sS https://deb.nodesource.com/setup_8.x \| sudo -E bash -

		RUN apt-get clean && apt-get upgrade -y && apt-get update -y --fix-missing && apt-get install -y nodejs

Added Docker push postpublish script #1397

Added Docker push postpublish script #1397

Conversation

rishivikram commented Jan 24, 2018 • edited Loading

kunagpal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sheluchin commented Mar 2, 2018

guessi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

liyinchigithub commented Nov 13, 2018

kunagpal commented Nov 13, 2018 • edited Loading

liyinchigithub commented Nov 13, 2018

rishivikram commented Jan 24, 2018 •

edited

Loading

kunagpal commented Nov 13, 2018 •

edited

Loading