github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

remove base-image

pull/1081/head
Nils 2021-08-28 00:47:35 +02:00
parent 6a0250b0ea
commit e36323c247
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -111,13 +111,10 @@ db-down:
console: console:
docker exec -t -i statping /bin/sh docker exec -t -i statping /bin/sh
compose-build-full: docker-base compose-build-full:
docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml build --parallel --build-arg VERSION=${VERSION} docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml build --parallel --build-arg VERSION=${VERSION}
docker-base: docker-latest:
docker build -t statping-ng/statping-ng:base -f Dockerfile.base --build-arg VERSION=${VERSION} .
docker-latest: docker-base
docker build -t statping-ng/statping-ng:latest --build-arg VERSION=${VERSION} . docker build -t statping-ng/statping-ng:latest --build-arg VERSION=${VERSION} .
docker-vue: docker-vue:
@ -126,13 +123,6 @@ docker-vue:
docker-test: docker-test:
docker-compose -f docker-compose.test.yml up --remove-orphans docker-compose -f docker-compose.test.yml up --remove-orphans
push-base: clean compile docker-base
docker push statping-ng/statping-ng:base
push-vue: clean compile docker-base docker-vue
docker push statping-ng/statping-ng:base
docker push statping-ng/statping-ng:vue
modd: modd:
modd -f ./dev/modd.conf modd -f ./dev/modd.conf
@ -285,16 +275,9 @@ download-key:
wget -O statping.gpg $(SIGN_URL) wget -O statping.gpg $(SIGN_URL)
gpg --import statping.gpg gpg --import statping.gpg
# push the :dev docker tag using curl
dockerhub-dev:
docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:dev --no-cache -f Dockerfile.base .
docker push statping-ng/statping-ng:dev
dockerhub: dockerhub:
docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:base --no-cache -f Dockerfile.base .
docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:latest --no-cache -f Dockerfile . docker build --build-arg VERSION=${VERSION} -t statping-ng/statping-ng:latest --no-cache -f Dockerfile .
docker tag statping-ng/statping-ng statping-ng/statping-ng:v${VERSION} docker tag statping-ng/statping-ng statping-ng/statping-ng:v${VERSION}
docker push statping-ng/statping-ng:base
docker push statping-ng/statping-ng:v${VERSION} docker push statping-ng/statping-ng:v${VERSION}
docker push statping-ng/statping-ng docker push statping-ng/statping-ng
@ -392,12 +375,6 @@ buildx-dev: multiarch
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/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 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/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 rm statping-dev
buildx-base: multiarch
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,mode=max" --push --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
multiarch: multiarch:
mkdir /tmp/.buildx-cache || true mkdir /tmp/.buildx-cache || true
docker run --rm --privileged multiarch/qemu-user-static --reset -p yes docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
@ -426,5 +403,5 @@ gen_help:
marked -o html/$file.html $file --gfm marked -o html/$file.html $file --gfm
done done
.PHONY: all check build certs multiarch install-darwin go-build build-all buildx-base buildx-dev buildx-latest build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman .PHONY: all check build certs multiarch install-darwin go-build build-all buildx-dev buildx-latest build-alpine test-all test test-api docker frontend up down print_details lite sentry-release snapcraft build-linux build-mac build-win build-all postman
.SILENT: travis_s3_creds .SILENT: travis_s3_creds