Skip to content

Commit cca6997

Browse files
committed
feat(ci): add github actions
Signed-off-by: solidnerd <niclas@mietz.io>
1 parent 89ac8e2 commit cca6997

File tree

3 files changed

+59
-1
lines changed

3 files changed

+59
-1
lines changed

.github/workflows/main.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: Build and push Docker image
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- '*'
9+
10+
env:
11+
DOCKER_BUILDKIT: 1
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
- name: Build Image
20+
uses: docker/build-push-action@v1
21+
with:
22+
repository: solidnerd/bookstack-dev
23+
push: false
24+
tag_with_sha: true
25+
add_git_labels: true
26+
- name: Execute End-to-End Test
27+
run: make e2e
28+
- name: Build and Push
29+
uses: docker/build-push-action@v1
30+
with:
31+
username: ${{ secrets.DOCKER_USERNAME }}
32+
password: ${{ secrets.DOCKER_PASSWORD }}
33+
repository: solidnerd/bookstack
34+
tag_with_ref: true
35+
add_git_labels: true

.github/workflows/pr.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Build and Test
2+
3+
on:
4+
pull_request:
5+
6+
env:
7+
DOCKER_BUILDKIT: 1
8+
9+
jobs:
10+
build:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
- name: Build Image
16+
uses: docker/build-push-action@v1
17+
with:
18+
repository: solidnerd/bookstack-dev
19+
push: false
20+
tag_with_sha: true
21+
add_git_labels: true
22+
- name: Execute End-to-End Test
23+
run: make e2e

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
DOCKER_RELEASE_REG=solidnerd
22
DOCKER_IMAGE=bookstack
33
DOCKER_IMAGE_DEV=${DOCKER_IMAGE}-dev
4-
DOCKER_INTERNAL_TAG := $(shell git rev-parse --short HEAD)
4+
DOCKER_INTERNAL_TAG := "sha-$(shell git rev-parse --short HEAD)"
55
DOCKER_RELEASE_TAG := $(shell git describe)
66
BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
77
VCS_URL := https://github.com/solidnerd/docker-bookstack

0 commit comments

Comments
 (0)