From 38532e576437aabf75ac1086508e00a05753f819 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Tue, 17 Aug 2021 10:42:17 +0100 Subject: [PATCH] Another dev docker workflow test. --- .github/workflows/2_unstable.yml | 51 +++++--------------------------- Makefile | 18 +++++------ 2 files changed, 17 insertions(+), 52 deletions(-) diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index 918d1963..b927f7bb 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -428,6 +428,7 @@ jobs: docker-release: needs: [build, test-postman-sqlite, test-postman-mysql, test-postman-postgres] runs-on: [self-hosted, linux, aboutcher-hosted, rocky8] + steps: - name: Checkout Statping Repo uses: actions/checkout@v2 @@ -453,61 +454,25 @@ jobs: key: buildx-docker-master restore-keys: | buildx-docker-master + + - name: Docker Login + env: + DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} + run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin + - name: Docker Build :base run: make buildx-base - - - name: Docker Login - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin - - - name: Docker Upload amd64 :base - run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform linux/amd64 -f Dockerfile.base -t adamboutcher/statping-ng:base . - name: Docker Login env: DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin - - - name: Docker Upload arm64 :base - run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform linux/arm64 -f Dockerfile.base -t adamboutcher/statping-ng:base . - - - - name: Docker Login - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin - - - name: Docker Upload arm7 :base - run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform linux/arm/v7 -f Dockerfile.base -t adamboutcher/statping-ng:base . - - - name: Docker Login - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin - - - name: Docker Upload arm6 :base - run: docker buildx build --builder statping-base --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform linux/arm/v6 -f Dockerfile.base -t adamboutcher/statping-ng:base . - name: Docker Build :dev run: make buildx-dev - - name: Docker Login - env: - DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} - DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} - run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin - - - name: Docker Upload :dev - run: docker buildx build --builder statping-dev --push --cache-from=type=local,src=/tmp/.buildx-cache --push --cache-from=type=local,src=/tmp/.buildx-cache --platform linux/amd64,linux/arm64,linux/arm/7,linux/arm/v6 -f Dockerfile.base -t adamboutcher/statping-ng:dev . - - - name: Clean - run: docker buildx rm statping-base && docker buildx rm statping-dev - # sentry-release: # needs: [test, test-postman-sqlite, test-postman-postgres, test-postman-mysql] diff --git a/Makefile b/Makefile index 458a6168..d3972e9f 100644 --- a/Makefile +++ b/Makefile @@ -381,22 +381,22 @@ xgo-latest: xgo --go $(GOVERSION) --targets=linux/amd64,linux/386,linux/arm-7,linux/arm-6,linux/arm64,windows/386,windows/amd64,darwin/386,darwin/amd64 --out='statping' --pkg='cmd' --dest=build --tags 'netgo' --ldflags='-X main.VERSION=${VERSION} -X main.COMMIT=$(COMMIT) -linkmode external -extldflags "-static"' . buildx-latest: multiarch - docker buildx create --name statping-latest + docker buildx create --name statping-latest --driver-opt image=moby/buildkit:master docker buildx inspect --builder statping-latest --bootstrap - docker buildx build --builder statping-latest --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --pull --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t adamboutcher/statping-ng:latest -t adamboutcher/statping-ng:v${VERSION} --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . -# docker buildx rm statping-latest + docker buildx build --builder statping-latest --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache,mode=max" --push --pull --platform linux/386,linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t adamboutcher/statping-ng:latest -t adamboutcher/statping-ng:v${VERSION} --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . + docker buildx rm statping-latest buildx-dev: multiarch - docker buildx create --name statping-dev + docker buildx create --name statping-dev --driver-opt image=moby/buildkit:master docker buildx inspect --builder statping-dev --bootstrap - docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t adamboutcher/statping-ng:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . -# docker buildx rm statping-dev + docker buildx build --builder statping-dev --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache,mode=max" --push --platform linux/386,linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile -t adamboutcher/statping-ng:dev --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . + docker buildx rm statping-dev buildx-base: multiarch - docker buildx create --name statping-base + docker buildx create --name statping-base --driver-opt image=moby/buildkit:master docker buildx inspect --builder statping-base --bootstrap - docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache" --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t adamboutcher/statping-ng:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . -# docker buildx rm statping-base + docker buildx build --builder statping-base --cache-from "type=local,src=/tmp/.buildx-cache" --cache-to "type=local,dest=/tmp/.buildx-cache,mode=max" --push --platform linux/386,linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -f Dockerfile.base -t adamboutcher/statping-ng:base --build-arg=VERSION=${VERSION} --build-arg=COMMIT=${COMMIT} . + docker buildx rm statping-base multiarch: mkdir /tmp/.buildx-cache || true