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.

Sign up for GitHub

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

Jump to bottom

feat: multi-platform Docker images #3029

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat: multi-platform Docker images #3029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 0 additions & 48 deletions docker/images/alpine33/Dockerfile
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions docker/images/alpine33/README.md
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion docker/images/ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:18.04
LABEL maintainer="Postman Labs <help@postman.com>"

ARG NODE_VERSION=10
ARG NODE_VERSION=16
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Current NodeJS LTS is 20, but Nodesource only supports up to 16 on ubuntu:18.04.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that this PR is about a year old. I no longer have a need for these changes and will therefore not work on this PR anymore. Feel free to pick up on this state.

ARG NEWMAN_VERSION

# Bail out early if NODE_VERSION is not provided
Expand Down
40 changes: 0 additions & 40 deletions docker/images/ubuntu1404/Dockerfile
View file
Open in desktop

This file was deleted.

39 changes: 0 additions & 39 deletions docker/images/ubuntu1404/README.md
View file
Open in desktop

This file was deleted.

89 changes: 47 additions & 42 deletions npm/postpublish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
#!/usr/bin/env bash

# Bail out on the first error
set -e;
set -eo pipefail;

LATEST="alpine";
BLUE="\033[0;34m";
Expand All @@ -17,62 +17,67 @@ GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD);
MAJOR=$(echo ${VERSION} | grep -oE "^\d+");
MINOR=$(echo ${VERSION} | grep -oE "^\d+\.\d+");

function build_docker_image {
local TAG=$(basename $1);
function validate_docker_image {
local OS="$(basename $1)"
local IMAGE_NAME="newman-test-$OS";

echo "";

echo -e "$BLUE Building $DOCKER_REPO:$VERSION-$TAG $NO_COLOUR";
echo -e "$BLUE Building Docker image (OS: $OS) for local image validation test $NO_COLOUR";

docker build \
--no-cache --force-rm --squash -t ${DOCKER_REPO}:${VERSION}-${TAG} \
--file="docker/images/$TAG/Dockerfile" --build-arg NEWMAN_VERSION=${VERSION} .;
--no-cache \
--force-rm \
-t $IMAGE_NAME \
--file="docker/images/$OS/Dockerfile" \
--build-arg NEWMAN_VERSION=${VERSION} \
.;

echo -e "$BLUE Running docker image test for $DOCKER_REPO:$VERSION-$TAG, latest $NO_COLOUR";
echo -e "$BLUE Running Docker image (OS: $OS) test $NO_COLOUR";

# Test
docker run -v ${PWD}/examples:/etc/newman -t ${DOCKER_REPO}:${VERSION}-${TAG} run "sample-collection.json";
docker run -v ${PWD}/examples:/etc/newman --rm -t $IMAGE_NAME run "sample-collection.json";

echo -e "$BLUE Removing Docker image (OS: $OS) from local Docker $NO_COLOUR";
docker rmi $IMAGE_NAME
}

function build_docker_image {
local OS="$(basename $1)"

echo -e "$BLUE Pushing docker image for $DOCKER_REPO:$VERSION-$TAG $NO_COLOUR";
local TAGS=""

echo "";

# Tag
if [[ ${GIT_BRANCH} == "master" ]]; then
if [[ ${TAG} == "ubuntu1404" || ${TAG} == "alpine33" ]]; then
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}_${TAG}:latest;
docker push ${DOCKER_REPO}_${TAG}:latest;
else
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${TAG};
docker push ${DOCKER_REPO}:${TAG};

if [[ ${TAG} == ${LATEST} ]]; then
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:latest;
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${VERSION};
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MINOR};
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MAJOR};

docker push ${DOCKER_REPO}:latest;
docker push ${DOCKER_REPO}:${VERSION};
docker push ${DOCKER_REPO}:${MINOR};
docker push ${DOCKER_REPO}:${MAJOR};
fi
TAGS="$TAGS -t ${DOCKER_REPO}:${OS}"

if [[ ${OS} == ${LATEST} ]]; then
TAGS="$TAGS -t ${DOCKER_REPO}:latest";
TAGS="$TAGS -t ${DOCKER_REPO}:${VERSION}";
TAGS="$TAGS -t ${DOCKER_REPO}:${MINOR}";
TAGS="$TAGS -t ${DOCKER_REPO}:${MAJOR}";
fi
fi

if [[ ${TAG} == "ubuntu1404" || ${TAG} == "alpine33" ]]; then
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}_${TAG}:${VERSION};
docker push ${DOCKER_REPO}_${TAG}:${VERSION};
else
# Push
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${VERSION}-${TAG};
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MINOR}-${TAG};
docker tag ${DOCKER_REPO}:${VERSION}-${TAG} ${DOCKER_REPO}:${MAJOR}-${TAG};

docker push ${DOCKER_REPO}:${VERSION}-${TAG};
docker push ${DOCKER_REPO}:${MINOR}-${TAG};
docker push ${DOCKER_REPO}:${MAJOR}-${TAG};
fi
TAGS="$TAGS -t ${DOCKER_REPO}:${VERSION}-${OS}";
TAGS="$TAGS -t ${DOCKER_REPO}:${MINOR}-${OS}";
TAGS="$TAGS -t ${DOCKER_REPO}:${MAJOR}-${OS}";

echo -e "$BLUE Will now build and push multi-platform Docker image with tags $TAGS $NO_COLOUR";

docker buildx build \
--platform linux/amd64,linux/arm64 \
--no-cache \
--force-rm \
${TAGS} \
--file="docker/images/$OS/Dockerfile" \
--build-arg NEWMAN_VERSION=${VERSION} \
--push \
.;
}

for image in ${IMAGES_BASE_PATH}/*; do
validate_docker_image ${image};
build_docker_image ${image};
done