diff --git a/.circleci/config.yml b/.circleci/config.yml index e3ed70249..539567c9a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -455,16 +455,19 @@ jobs: # There is an edge case that would cause an issue here - if dependencies are updated to an exact copy # of a previous version, for example if packge-lock.json is reverted, we need to manually push the new # image to the "latest" tag + # Ignore job if running an enterprise build IMAGE_TAG=$(cat website/Dockerfile website/package-lock.json | sha256sum | awk '{print $1;}') echo "Using $IMAGE_TAG" - if ! curl https://hub.docker.com/v2/repositories/hashicorp/nomad-website/tags/$IMAGE_TAG -fsL > /dev/null; then - cd website/ - docker build -t hashicorp/nomad-website:$IMAGE_TAG . - docker tag hashicorp/nomad-website:$IMAGE_TAG hashicorp/nomad-website:latest - docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS - docker push hashicorp/nomad-website + if [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/nomad" ]; then + echo "Not Nomad OSS Repo, not building website docker image" + elif curl https://hub.docker.com/v2/repositories/hashicorp/nomad-website/tags/$IMAGE_TAG -fsL > /dev/null; then + echo "Dependencies have not changed, not building a new website docker image." else - echo "Dependencies have not changed, not building a new website docker image." + cd website/ + docker build -t hashicorp/nomad-website:$IMAGE_TAG . + docker tag hashicorp/nomad-website:$IMAGE_TAG hashicorp/nomad-website:latest + docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS + docker push hashicorp/nomad-website fi name: Build Docker Image if Necessary test-other: diff --git a/.circleci/config/jobs/website-docker-image.yml b/.circleci/config/jobs/website-docker-image.yml index f73386ffc..207f591bb 100644 --- a/.circleci/config/jobs/website-docker-image.yml +++ b/.circleci/config/jobs/website-docker-image.yml @@ -10,14 +10,17 @@ steps: # There is an edge case that would cause an issue here - if dependencies are updated to an exact copy # of a previous version, for example if packge-lock.json is reverted, we need to manually push the new # image to the "latest" tag + # Ignore job if running an enterprise build IMAGE_TAG=$(cat website/Dockerfile website/package-lock.json | sha256sum | awk '{print $1;}') echo "Using $IMAGE_TAG" - if ! curl https://hub.docker.com/v2/repositories/hashicorp/nomad-website/tags/$IMAGE_TAG -fsL > /dev/null; then - cd website/ - docker build -t hashicorp/nomad-website:$IMAGE_TAG . - docker tag hashicorp/nomad-website:$IMAGE_TAG hashicorp/nomad-website:latest - docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS - docker push hashicorp/nomad-website + if [ "$CIRCLE_REPOSITORY_URL" != "git@github.com:hashicorp/nomad" ]; then + echo "Not Nomad OSS Repo, not building website docker image" + elif curl https://hub.docker.com/v2/repositories/hashicorp/nomad-website/tags/$IMAGE_TAG -fsL > /dev/null; then + echo "Dependencies have not changed, not building a new website docker image." else - echo "Dependencies have not changed, not building a new website docker image." + cd website/ + docker build -t hashicorp/nomad-website:$IMAGE_TAG . + docker tag hashicorp/nomad-website:$IMAGE_TAG hashicorp/nomad-website:latest + docker login -u $WEBSITE_DOCKER_USER -p $WEBSITE_DOCKER_PASS + docker push hashicorp/nomad-website fi