fergalmoran/bitchmin
1
0
Fork 0
mirror of https://github.com/fergalmoran/bitchmin.git synced 2025-12-22 09:27:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

:Merge branch 'develop' into trunk

Browse Source
This commit is contained in:
Fergal Moran
2020-09-05 03:21:45 +01:00
parent d378e3b9b3 bedee88554
commit 4648440a25
2 changed files with 60 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
.github/workflows/build-client.yml vendored
View File

@@ -1,65 +1,65 @@
name: build-client
# name: build-client
on:
push:
branches: trunk
# on:
# push:
# branches: trunk
jobs:
buildx:
runs-on: ubuntu-latest
steps:
-
name: Checkout
uses: actions/checkout@v2
-
name: Prepare
id: prepare
run: |
DOCKER_IMAGE=fergalmoran/bitchmin-web
DOCKER_PLATFORMS=linux/amd64,linux/arm/v7
VERSION=latest
# jobs:
# buildx:
# runs-on: ubuntu-latest
# steps:
# -
# name: Checkout
# uses: actions/checkout@v2
# -
# name: Prepare
# id: prepare
# run: |
# DOCKER_IMAGE=fergalmoran/bitchmin-web
# DOCKER_PLATFORMS=linux/amd64,linux/arm/v7
# VERSION=latest
if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF#refs/tags/v}
fi
if [ "${{ github.event_name }}" = "schedule" ]; then
VERSION=nightly
fi
# if [[ $GITHUB_REF == refs/tags/* ]]; then
# VERSION=${GITHUB_REF#refs/tags/v}
# fi
# if [ "${{ github.event_name }}" = "schedule" ]; then
# VERSION=nightly
# fi
TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
fi
# TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
# if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
# TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
# fi
echo ::set-output name=docker_image::${DOCKER_IMAGE}
echo ::set-output name=version::${VERSION}
echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
--build-arg VERSION=${VERSION} \
--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
--build-arg VCS_REF=${GITHUB_SHA::8} \
${TAGS} --file ./client/Dockerfile ./client
-
name: Set up Docker Buildx
uses: crazy-max/ghaction-docker-buildx@v3
-
name: Docker Buildx (build)
run: |
docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
-
name: Login to DockerHub
if: success() && github.event_name != 'pull_request'
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
-
name: Docker Buildx (push)
if: success() && github.event_name != 'pull_request'
run: |
docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
-
name: Inspect image
if: always() && github.event_name != 'pull_request'
run: |
docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
# echo ::set-output name=docker_image::${DOCKER_IMAGE}
# echo ::set-output name=version::${VERSION}
# echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
# --build-arg VERSION=${VERSION} \
# --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
# --build-arg VCS_REF=${GITHUB_SHA::8} \
# ${TAGS} --file ./client/Dockerfile ./client
# -
# name: Set up Docker Buildx
# uses: crazy-max/ghaction-docker-buildx@v3
# -
# name: Docker Buildx (build)
# run: |
# docker buildx build --output "type=image,push=false" ${{ steps.prepare.outputs.buildx_args }}
# -
# name: Login to DockerHub
# if: success() && github.event_name != 'pull_request'
# uses: docker/login-action@v1
# with:
# username: ${{ secrets.DOCKER_USERNAME }}
# password: ${{ secrets.DOCKER_PASSWORD }}
# -
# name: Docker Buildx (push)
# if: success() && github.event_name != 'pull_request'
# run: |
# docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }}
# -
# name: Inspect image
# if: always() && github.event_name != 'pull_request'
# run: |
# docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}

19
.github/workflows/build-server.yml vendored
View File

@@ -18,26 +18,9 @@ jobs:
DOCKER_IMAGE=fergalmoran/bitchmin-api
DOCKER_PLATFORMS=linux/amd64,linux/arm/v7
VERSION=latest
if [[ $GITHUB_REF == refs/tags/* ]]; then
VERSION=${GITHUB_REF#refs/tags/v}
fi
if [ "${{ github.event_name }}" = "schedule" ]; then
VERSION=nightly
fi
TAGS="--tag ${DOCKER_IMAGE}:${VERSION}"
if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
TAGS="$TAGS --tag ${DOCKER_IMAGE}:latest"
fi
echo ::set-output name=docker_image::${DOCKER_IMAGE}
echo ::set-output name=version::${VERSION}
echo ::set-output name=buildx_args::--platform ${DOCKER_PLATFORMS} \
--build-arg VERSION=${VERSION} \
--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
--build-arg VCS_REF=${GITHUB_SHA::8} \
${TAGS} --file ./server/Dockerfile ./server
--file ./server/Dockerfile ./server
-
name: Set up Docker Buildx
uses: crazy-max/ghaction-docker-buildx@v3