Skip to content

Commit

Permalink
Merge develop to master
Browse files Browse the repository at this point in the history
  • Loading branch information
TineCrnugelj committed Mar 27, 2023
2 parents 91ece50 + 18f3b0e commit 4a0824f
Show file tree
Hide file tree
Showing 83 changed files with 36,722 additions and 3,230 deletions.
57 changes: 57 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#
# @see https://github.com/prporso/rso-image-catalog-sample/blob/main/.github/workflows/dockerize.yml
# @see https://github.com/marketplace/actions/build-and-push-docker-images#customizing
# @see https://stackoverflow.com/questions/59073850/github-actions-get-url-of-test-build
#
name: Build Docker image

on:
push:
branches:
- master
tags:
- '*'
pull_request:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Get current time
id: current-time
uses: josStorer/[email protected]
with:
format: 'YYYY-MM-DD HH:mm:ss'
utcOffset: '+02:00'
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Determine image tag
run: |
TAG=${{ github.head_ref || github.ref_name }}
if [ "$TAG" == master ]; then
echo "TAG=latest" >> "$GITHUB_ENV"
else
echo "TAG=$TAG" >> "$GITHUB_ENV"
fi
- name: Build and push
uses: docker/build-push-action@v3
with:
context: .
push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/smrpo:${{ env.TAG }}
build-args: |
BUILD_DATE="${{ steps.current-time.outputs.formattedTime }}"
VCS_REF="${{ github.sha }}"
VCS_SRC="${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}"
VERSION="${{ env.TAG }}"
1 change: 1 addition & 0 deletions backend/config/example.env
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#BCRYPT_SALT_ROUNDS=10
#DEFAULT_USER_USERNAME=admin
#DEFAULT_USER_PASSWORD=admin
#[email protected]

#
# Database
Expand Down
3 changes: 2 additions & 1 deletion backend/config/test.env
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ LOG_REQUESTS=true
#BCRYPT_SALT_ROUNDS=10
#DEFAULT_USER_USERNAME=admin
#DEFAULT_USER_PASSWORD=admin
#[email protected]

#
# Database
Expand All @@ -41,4 +42,4 @@ TYPEORM_LOGGING = true

JWT_SECRET=z2aXo5zYnYjuEiFIyEGB42Qcpoia9Qpkiu6bvgQPIEmmRD1ujLK4cDpXrgs9qqTJ
#JWT_PUBLIC_KEY_PATH=
#JWT_PRIVATE_KEY_PATH=
#JWT_PRIVATE_KEY_PATH=
Loading

0 comments on commit 4a0824f

Please sign in to comment.