From 0ecde93012eacd696cd26b784d17874e4f396336 Mon Sep 17 00:00:00 2001 From: Daniel Moran Date: Thu, 11 Nov 2021 12:28:06 -0500 Subject: [PATCH] build: stop building & pushing images to quay.io (#22864) --- .circleci/config.yml | 26 +------------------------- .goreleaser.yml | 28 ---------------------------- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 87a2696041..6048c06fe6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -275,7 +275,7 @@ commands: tar -C ${HOME}/.tools -xzf go${GO_VERSION}.linux-amd64.tar.gz echo 'export PATH=${HOME}/.tools/go/bin:${PATH}' >> $BASH_ENV - # Install dependencies for cross building binaries with goreleaser. Does not include Docker cross-builder. + # Install dependencies for cross building binaries with goreleaser. install_cross_bin_deps: steps: - run: @@ -367,36 +367,12 @@ commands: command: | echo -e "$GPG_PRIVATE_KEY" > private.key gpg --batch --import private.key - - quay_login - run: name: Set GOPATH # Machine executors use a different GOPATH from the cimg/go Docker executors. command: | echo 'export GOPATH=/home/circleci/go' >> $BASH_ENV echo 'export PATH=${GOPATH}/bin:${PATH}' >> $BASH_ENV - - run: - name: Set up Docker cross-builder - command: | - # Get jq to parse binfmt output. - sudo apt-get update && sudo apt-get install -y jq - - # Uninstall any emulators provided by the system. - emulators=($(docker run --rm --privileged tonistiigi/binfmt:latest | jq -r .emulators[])) - for e in ${emulators[@]}; do - docker run --rm --privileged tonistiigi/binfmt:latest --uninstall ${e} - done - - # Install the QEMU emulators we need to cross-build. - docker run --rm --privileged tonistiigi/binfmt:latest --install all - - # Create a new buildx context using the freshly-installed emulators. - docker buildx create --name cross-builder - docker buildx use --default cross-builder - docker buildx inspect --bootstrap - - # Build the 1st stage of our Docker(s) on our target platforms, to flush out - # any problems in our emulator setup. - docker buildx build --target dependency-base --platform linux/amd64,linux/arm64 docker/influxd - install_cross_bin_deps - unless: condition: << parameters.publish_release >> diff --git a/.goreleaser.yml b/.goreleaser.yml index 2ad853086b..596c689a19 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -105,34 +105,6 @@ checksum: name_template: "influxdb2-nightly.sha256" algorithm: sha256 -dockers: - - goos: linux - goarch: amd64 - image_templates: - - "quay.io/influxdb/influxdb-amd64:nightly" - dockerfile: docker/influxd/Dockerfile - extra_files: - - docker/influxd/entrypoint.sh - build_flag_templates: - - "--platform=linux/amd64" - use_buildx: true - - goos: linux - goarch: arm64 - image_templates: - - "quay.io/influxdb/influxdb-arm64v8:nightly" - dockerfile: docker/influxd/Dockerfile - extra_files: - - docker/influxd/entrypoint.sh - build_flag_templates: - - "--platform=linux/arm64/v8" - use_buildx: true - -docker_manifests: - - name_template: "quay.io/influxdb/influxdb:nightly" - image_templates: - - "quay.io/influxdb/influxdb-amd64:nightly" - - "quay.io/influxdb/influxdb-arm64v8:nightly" - signs: - signature: "${artifact}.asc" cmd: gpg