diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml new file mode 100644 index 0000000..b1a621f --- /dev/null +++ b/.github/workflows/build-and-deploy.yml @@ -0,0 +1,18 @@ +name: Build and Deploy +on: [push] +jobs: + Build-And-Deploy: + runs-on: ubuntu-latest + permissions: + id-token: write + contents: read + steps: + - name: Check out repository code + uses: actions/checkout@v3 + - name: Set up Go 1.x + uses: actions/setup-go@v2 + with: + go-version: 1.15.6 + - name: Build + run: | + make build tag push diff --git a/Dockerfile.docker-compose b/Dockerfile.docker-compose index fda71f4..ee56156 100644 --- a/Dockerfile.docker-compose +++ b/Dockerfile.docker-compose @@ -3,6 +3,7 @@ FROM alpine:3.5 # https://serverfault.com/questions/772227/chmod-not-working-correctly-in-docker RUN apk add --update docker py-pip python-dev libffi-dev openssl-dev gcc libc-dev make ca-certificates +RUN pip install --upgrade pip RUN pip install docker-compose COPY bin/devops-alpine /usr/local/bin/devops diff --git a/makefile b/makefile index 41f93b3..a052976 100644 --- a/makefile +++ b/makefile @@ -2,8 +2,8 @@ OWNER=novacloud IMAGE_NAME=devops QNAME=$(OWNER)/$(IMAGE_NAME) -GIT_TAG=$(QNAME):$(TRAVIS_COMMIT) -BUILD_TAG=$(QNAME):0.1.$(TRAVIS_BUILD_NUMBER) +GIT_TAG=$(QNAME):$(GITHUB_SHA) +BUILD_TAG=$(QNAME):0.1.$(GITHUB_RUN_NUMBER) LATEST_TAG=$(QNAME):latest lint: