Skip to content

Commit 60883aa

Browse files
turegjorupturegjorup
authored
Merge branch 'develop' into feature/SUPP0RT-1109_user_tenants_commands
2 parents c1d5319 + 0fe2eb2 commit 60883aa

40 files changed

+707
-112
lines changed

‎.github/workflows/github_build_release.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
on:
2+
push:
3+
tags:
4+
- '*.*.*'
5+
6+
name: Create Github Release
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
create-release:
13+
runs-on: ubuntu-latest
14+
env:
15+
COMPOSER_ALLOW_SUPERUSER: 1
16+
APP_ENV: prod
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v3
20+
21+
- name: Composer install
22+
run: |
23+
docker network create frontend
24+
docker compose run --rm phpfpm composer install --no-dev -o --classmap-authoritative
25+
docker compose run --rm phpfpm composer clear-cache
26+
rm -rf infrastructure
27+
28+
- name: Make assets dir
29+
run: |
30+
mkdir -p ../assets
31+
32+
- name: Create archive
33+
run: |
34+
tar \
35+
-zcf ../assets/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz ./*
36+
37+
- name: Create checksum
38+
run: sha256sum ../assets/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz > ../assets/checksum.txt
39+
40+
- name: Create a release in GitHub and uploads assets
41+
run: |
42+
gh release create ${{ github.ref_name }} --verify-tag --generate-notes ../assets/*.*
43+
env:
44+
GITHUB_TOKEN: ${{ github.TOKEN }}
45+
shell: bash

‎.github/workflows/docker_build_develop.yml‎ renamed to ‎.github/workflows/itkdev_docker_build_develop.yml‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,16 @@ on:
33
push:
44
branches:
55
- 'develop'
6-
name: Build docker image (develop)
6+
7+
# This Action builds to itkdev/* using ./infrastructure/itkdev/*
8+
name: ITK Dev - Build docker image (develop)
79

810
jobs:
911
docker:
1012
runs-on: ubuntu-latest
1113
env:
1214
APP_VERSION: develop
15+
COMPOSER_ALLOW_SUPERUSER: 1
1316
steps:
1417
- name: Checkout
1518
uses: actions/checkout@v3
@@ -30,8 +33,8 @@ jobs:
3033
- name: Build and push (API)
3134
uses: docker/build-push-action@v4
3235
with:
33-
context: ./infrastructure/display-api-service/
34-
file: ./infrastructure/display-api-service/Dockerfile
36+
context: ./infrastructure/itkdev/display-api-service/
37+
file: ./infrastructure/itkdev/display-api-service/Dockerfile
3538
build-args: |
3639
VERSION=${{ env.APP_VERSION }}
3740
push: true
@@ -48,8 +51,8 @@ jobs:
4851
- name: Build and push (Nginx)
4952
uses: docker/build-push-action@v4
5053
with:
51-
context: ./infrastructure/nginx/
52-
file: ./infrastructure/nginx/Dockerfile
54+
context: ./infrastructure/itkdev/nginx/
55+
file: ./infrastructure/itkdev/nginx/Dockerfile
5356
build-args: |
5457
APP_VERSION=${{ env.APP_VERSION }}
5558
push: true

‎.github/workflows/docker_build_tag.yml‎ renamed to ‎.github/workflows/itkdev_docker_build_tag.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,15 @@ on:
33
push:
44
tags:
55
- '*'
6-
name: Build docker image (tag)
6+
7+
# This Action builds to itkdev/* using ./infrastructure/itkdev/*
8+
name: ITK Dev - Build docker image (tag)
79

810
jobs:
911
docker:
1012
runs-on: ubuntu-latest
13+
env:
14+
COMPOSER_ALLOW_SUPERUSER: 1
1115
steps:
1216
- name: Checkout
1317
uses: actions/checkout@v3
@@ -28,8 +32,8 @@ jobs:
2832
- name: Build and push (API)
2933
uses: docker/build-push-action@v4
3034
with:
31-
context: ./infrastructure/display-api-service/
32-
file: ./infrastructure/display-api-service/Dockerfile
35+
context: ./infrastructure/itkdev/display-api-service/
36+
file: ./infrastructure/itkdev/display-api-service/Dockerfile
3337
build-args: |
3438
APP_VERSION=${{ github.ref }}
3539
push: true
@@ -50,8 +54,8 @@ jobs:
5054
- name: Build and push (Nginx)
5155
uses: docker/build-push-action@v4
5256
with:
53-
context: ./infrastructure/nginx/
54-
file: ./infrastructure/nginx/Dockerfile
57+
context: ./infrastructure/itkdev/nginx/
58+
file: ./infrastructure/itkdev/nginx/Dockerfile
5559
build-args: |
5660
APP_VERSION=${{ steps.get_tag.outputs.git_tag }}
5761
push: true

‎.github/workflows/os2display_docker_build_develop.yml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
on:
3+
push:
4+
branches:
5+
- 'develop'
6+
7+
# This Action builds to os2display/* using ./infrastructure/os2display/*
8+
name: OS2display - Build docker image (develop)
9+
10+
jobs:
11+
docker:
12+
runs-on: ubuntu-latest
13+
env:
14+
APP_VERSION: develop
15+
COMPOSER_ALLOW_SUPERUSER: 1
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v3
19+
20+
- name: Login to DockerHub
21+
uses: docker/login-action@v2
22+
with:
23+
username: ${{ secrets.DOCKERHUB_USER }}
24+
password: ${{ secrets.DOCKERHUB_TOKEN }}
25+
26+
# Build api
27+
- name: Docker meta (API)
28+
id: meta-api
29+
uses: docker/metadata-action@v4
30+
with:
31+
images: os2display/display-api-service
32+
33+
- name: Build and push (API)
34+
uses: docker/build-push-action@v4
35+
with:
36+
context: ./infrastructure/os2display/display-api-service/
37+
file: ./infrastructure/os2display/display-api-service/Dockerfile
38+
build-args: |
39+
VERSION=${{ env.APP_VERSION }}
40+
push: true
41+
tags: ${{ steps.meta-api.outputs.tags }}
42+
labels: ${{ steps.meta-api.outputs.labels }}
43+
44+
# Build nginx (depends on api build)
45+
- name: Docker meta (Nginx)
46+
id: meta-nginx
47+
uses: docker/metadata-action@v4
48+
with:
49+
images: os2display/display-api-service-nginx
50+
51+
- name: Build and push (Nginx)
52+
uses: docker/build-push-action@v4
53+
with:
54+
context: ./infrastructure/os2display/nginx/
55+
file: ./infrastructure/os2display/nginx/Dockerfile
56+
build-args: |
57+
APP_VERSION=${{ env.APP_VERSION }}
58+
push: true
59+
tags: ${{ steps.meta-nginx.outputs.tags }}
60+
labels: ${{ steps.meta-nginx.outputs.labels }}

‎.github/workflows/os2display_docker_build_tag.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
---
2+
on:
3+
push:
4+
tags:
5+
- '*'
6+
7+
# This Action builds to os2display/* using ./infrastructure/os2display/*
8+
name: OS2display - Build docker image (tag)
9+
10+
jobs:
11+
docker:
12+
runs-on: ubuntu-latest
13+
env:
14+
COMPOSER_ALLOW_SUPERUSER: 1
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@v3
18+
19+
- name: Login to DockerHub
20+
uses: docker/login-action@v2
21+
with:
22+
username: ${{ secrets.DOCKERHUB_USER }}
23+
password: ${{ secrets.DOCKERHUB_TOKEN }}
24+
25+
# Build api
26+
- name: Docker meta (API)
27+
id: meta-api
28+
uses: docker/metadata-action@v4
29+
with:
30+
images: os2display/display-api-service
31+
32+
- name: Build and push (API)
33+
uses: docker/build-push-action@v4
34+
with:
35+
context: ./infrastructure/os2display/display-api-service/
36+
file: ./infrastructure/os2display/display-api-service/Dockerfile
37+
build-args: |
38+
APP_VERSION=${{ github.ref }}
39+
push: true
40+
tags: ${{ steps.meta-api.outputs.tags }}
41+
labels: ${{ steps.meta-api.outputs.labels }}
42+
43+
# Build nginx (depends on api build)
44+
- name: Docker meta (Nginx)
45+
id: meta-nginx
46+
uses: docker/metadata-action@v4
47+
with:
48+
images: os2display/display-api-service-nginx
49+
50+
- name: Get the tag
51+
id: get_tag
52+
run: echo ::set-output name=git_tag::$(echo $GITHUB_REF_NAME)
53+
54+
- name: Build and push (Nginx)
55+
uses: docker/build-push-action@v4
56+
with:
57+
context: ./infrastructure/os2display/nginx/
58+
file: ./infrastructure/os2display/nginx/Dockerfile
59+
build-args: |
60+
APP_VERSION=${{ steps.get_tag.outputs.git_tag }}
61+
push: true
62+
tags: ${{ steps.meta-nginx.outputs.tags }}
63+
labels: ${{ steps.meta-nginx.outputs.labels }}

‎.github/workflows/php_upgrade.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
on: pull_request
2-
name: Upgrade
2+
name: PHP Upgrade Check
33
jobs:
44
test-composer-install:
55
runs-on: ubuntu-latest
6+
env:
7+
COMPOSER_ALLOW_SUPERUSER: 1
68
strategy:
79
fail-fast: false
810
matrix:
@@ -91,7 +93,7 @@ jobs:
9193
runs-on: ubuntu-latest
9294
services:
9395
mariadb:
94-
image: mariadb:latest
96+
image: mariadb:lts
9597
ports:
9698
- 3306
9799
env:

‎.github/workflows/pr.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
on: pull_request
2-
name: Review
2+
name: Pull Request Review
33
jobs:
44
test-composer-install:
55
runs-on: ubuntu-latest
6+
env:
7+
COMPOSER_ALLOW_SUPERUSER: 1
68
strategy:
79
fail-fast: false
810
matrix:
@@ -141,7 +143,7 @@ jobs:
141143
runs-on: ubuntu-latest
142144
services:
143145
mariadb:
144-
image: mariadb:latest
146+
image: mariadb:lts
145147
ports:
146148
- 3306
147149
env:

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66
- Update docker build to publish to "os2display" org on docker hub. Update github workflow to latest actions.
7+
- Set up separate image builds for itkdev and os2display
78
- Updated `EventDatabaseApiFeedType` query ensuring started
89
but not finished events are found.
910
- Refactored all feed related classes and services

‎docker-compose.dev.yml‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎docker-compose.redirect.yml‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)