Add github actions

novacloudcz · May 2, 2023 · e753904 · e753904
1 parent b77244a
commit e753904
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml
@@ -0,0 +1,21 @@
+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
+        env:
+          DOCKER_USER: ${{ secrets.DOCKER_USER }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          make build tag push
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.5
+FROM alpine:3.17
 
 # https://serverfault.com/questions/772227/chmod-not-working-correctly-in-docker
 RUN apk --update add docker

diff --git a/Dockerfile.docker-compose b/Dockerfile.docker-compose
@@ -1,9 +1,9 @@
 # building custom image due to https://github.com/xueshanf/docker-awscli/issues/6
-FROM alpine:3.5
+FROM alpine:3.17
 
 # 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 docker-compose
+RUN apk update
+RUN apk add docker docker-cli-compose
 
 COPY bin/devops-alpine /usr/local/bin/devops
 RUN chmod +x /usr/local/bin/devops

diff --git a/Dockerfile.mysql b/Dockerfile.mysql
@@ -1,5 +1,5 @@
 # building custom image due to https://github.com/xueshanf/docker-awscli/issues/6
-FROM alpine:3.5
+FROM alpine:3.17
 
 # https://serverfault.com/questions/772227/chmod-not-working-correctly-in-docker
 RUN apk --update add zip docker mysql-client

diff --git 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:
@@ -32,7 +32,7 @@ tag:
 	docker tag $(GIT_TAG)-docker-compose $(LATEST_TAG)-docker-compose	
 
 login:
-	@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)"
+	@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASSWORD)"
 push: login
 	# docker push $(GIT_TAG)
 	# docker push $(BUILD_TAG)