diff --git a/.circleci/config.yml b/.circleci/config.yml index b417adc2..7f870d0e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -49,27 +49,6 @@ jobs: sudo docker push "$DOCKERHUB_DESTINATION" no_output_timeout: 25m - publish_docker_multiarch: - machine: - enabled: true - image: circleci/classic:201808-01 - steps: - - run: - command: | - # Turn on Experimental features - LATEST_TAG="${CIRCLE_TAG:1}" - sudo mkdir $HOME/.docker - sudo sh -c 'echo "{ \"experimental\": \"enabled\" }" >> $HOME/.docker/config.json' - # - sudo docker login --username=$DOCKERHUB_USER --password=$DOCKERHUB_PASS - # - sudo docker manifest create --amend "$DOCKERHUB_REPO:$LATEST_TAG" "$DOCKERHUB_REPO:$LATEST_TAG-amd64" "$DOCKERHUB_REPO:$LATEST_TAG-arm32v7" "$DOCKERHUB_REPO:$LATEST_TAG-arm64v8" - sudo docker manifest annotate "$DOCKERHUB_REPO:$LATEST_TAG" "$DOCKERHUB_REPO:$LATEST_TAG-amd64" --os linux --arch amd64 - sudo docker manifest annotate "$DOCKERHUB_REPO:$LATEST_TAG" "$DOCKERHUB_REPO:$LATEST_TAG-arm32v7" --os linux --arch arm --variant v7 - sudo docker manifest annotate "$DOCKERHUB_REPO:$LATEST_TAG" "$DOCKERHUB_REPO:$LATEST_TAG-arm64v8" --os linux --arch arm64 --variant v8 - sudo docker manifest push "$DOCKERHUB_REPO:$LATEST_TAG" -p - no_output_timeout: 25m - workflows: version: 2 publish: @@ -92,13 +71,3 @@ workflows: ignore: /.*/ tags: only: /v(?:(?(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?(?:0|[1-9](?:(?:0|[1-9])+)*))(?:-(?:([A-Za-z1-9])*))?)$/ - - publish_docker_multiarch: - requires: - - publish_docker_linuxamd64 - - publish_docker_linuxarm32v7 - - publish_docker_linuxarm64v8 - filters: - branches: - ignore: /.*/ - tags: - only: /v(?:(?(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?(?:0|[1-9](?:(?:0|[1-9])+)*))[.](?(?:0|[1-9](?:(?:0|[1-9])+)*))(?:-(?:([A-Za-z1-9])*))?)$/