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

buildx docker cross platform

pull/730/head^2
hunterlong 2020-07-09 12:29:46 -07:00
parent 7f5a6a2e7c
commit b9fe053234
4 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/dev.yml vendored
View File

@ -310,25 +310,16 @@ jobs:
run: echo ::set-env name=VERSION::$(cat version.txt) run: echo ::set-env name=VERSION::$(cat version.txt)
shell: bash shell: bash
- name: Base Docker Image - name: Set up Docker Buildx
uses: elgohr/Publish-Docker-Github-Action@master uses: crazy-max/ghaction-docker-buildx@v3
with:
name: statping/statping
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
dockerfile: Dockerfile.base
tags: "base"
- name: Dev Docker Image - name: Docker Login
uses: elgohr/Publish-Docker-Github-Action@master
env: env:
VERSION: ${{ env.VERSION }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
ARCH: amd64 DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_CLI_EXPERIMENTAL: enabled run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
with:
name: statping/statping - name: Docker Buildx (push)
username: ${{ secrets.DOCKER_USERNAME }} run: |
password: ${{ secrets.DOCKER_PASSWORD }} docker buildx create --use
dockerfile: Dockerfile docker buildx build --tag=statping/statping:dev --build-arg=VERSION=${VERSION} --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7 --output type=image,name=docker.io/statping/statping,push=true .
tags: "dev"
buildargs: VERSION,ARCH

31
.github/workflows/master.yml vendored
View File

@ -412,28 +412,19 @@ jobs:
run: echo ::set-env name=VERSION::$(cat version.txt) run: echo ::set-env name=VERSION::$(cat version.txt)
shell: bash shell: bash
- name: Base Docker Image - name: Set up Docker Buildx
uses: elgohr/Publish-Docker-Github-Action@master uses: crazy-max/ghaction-docker-buildx@v3
with:
name: statping/statping
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
dockerfile: Dockerfile.base
tags: "base"
- name: Latest/Version Docker Image - name: Docker Login
uses: elgohr/Publish-Docker-Github-Action@master
env: env:
VERSION: ${{ env.VERSION }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
ARCH: amd64 DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
DOCKER_CLI_EXPERIMENTAL: enabled run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
with:
name: statping/statping - name: Docker Buildx (push)
username: ${{ secrets.DOCKER_USERNAME }} run: |
password: ${{ secrets.DOCKER_PASSWORD }} docker buildx create --use
dockerfile: Dockerfile docker buildx build --tag=statping/statping,statping/statping:v${VERSION} --build-arg=VERSION=${VERSION} --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7 --output type=image,name=docker.io/statping/statping,push=true .
tags: "latest,v${{ env.VERSION }}"
buildargs: VERSION,ARCH
sentry-release: sentry-release:
needs: upload-release needs: upload-release

6
Makefile
View File

@ -331,5 +331,9 @@ certs:
-keyout key.pem \ -keyout key.pem \
-subj "/C=US/ST=California/L=Santa Monica/O=Statping/OU=Development/CN=localhost" -subj "/C=US/ST=California/L=Santa Monica/O=Statping/OU=Development/CN=localhost"
.PHONY: all build build-all 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 buildx:
docker buildx create --use
docker buildx build --tag=statping/statping:dev --build-arg=VERSION=${VERSION} --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7 --output type=image,name=docker.io/statping/statping,push=true .
.PHONY: all build build-all buildx 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

6
cmd/cli.go
View File

@ -189,9 +189,9 @@ func importCli(args []string) error {
if exportData.Config != nil { if exportData.Config != nil {
if ask("Create config.yml file from Configs?") { if ask("Create config.yml file from Configs?") {
log.Printf("Database User: %d\n", exportData.Config.DbUser) log.Printf("Database User: %s\n", exportData.Config.DbUser)
log.Printf("Database Password: %d\n", exportData.Config.DbPass) log.Printf("Database Password: %s\n", exportData.Config.DbPass)
log.Printf("Database Host: %d\n", exportData.Config.DbHost) log.Printf("Database Host: %s\n", exportData.Config.DbHost)
log.Printf("Database Port: %d\n", exportData.Config.DbPort) log.Printf("Database Port: %d\n", exportData.Config.DbPort)
if err := exportData.Config.Save(utils.Directory); err != nil { if err := exportData.Config.Save(utils.Directory); err != nil {
return err return err