Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/docker_build_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
runs-on: ubuntu-latest
env:
APP_VERSION: develop
COMPOSER_ALLOW_SUPERUSER: 1
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -25,7 +26,7 @@ jobs:
id: meta-api
uses: docker/metadata-action@v4
with:
images: itkdev/os2display-api-service
images: os2display/display-api-service

- name: Build and push (API)
uses: docker/build-push-action@v4
Expand All @@ -43,7 +44,7 @@ jobs:
id: meta-nginx
uses: docker/metadata-action@v4
with:
images: itkdev/os2display-api-service-nginx
images: os2display/display-api-service-nginx

- name: Build and push (Nginx)
uses: docker/build-push-action@v4
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/docker_build_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ name: Build docker image (tag)
jobs:
docker:
runs-on: ubuntu-latest
env:
COMPOSER_ALLOW_SUPERUSER: 1
steps:
- name: Checkout
uses: actions/checkout@v3
Expand All @@ -23,7 +25,7 @@ jobs:
id: meta-api
uses: docker/metadata-action@v4
with:
images: itkdev/os2display-api-service
images: os2display/display-api-service

- name: Build and push (API)
uses: docker/build-push-action@v4
Expand All @@ -41,7 +43,7 @@ jobs:
id: meta-nginx
uses: docker/metadata-action@v4
with:
images: itkdev/os2display-api-service-nginx
images: os2display/display-api-service-nginx

- name: Get the tag
id: get_tag
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/github_build_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
on:
push:
tags:
- '*.*.*'

name: Create Github Release

permissions:
contents: write

jobs:
create-release:
runs-on: ubuntu-latest
env:
COMPOSER_ALLOW_SUPERUSER: 1
APP_ENV: prod
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Composer install
run: |
docker network create frontend
docker compose run --rm phpfpm composer install --no-dev -o --classmap-authoritative
docker compose run --rm phpfpm composer clear-cache
rm -rf infrastructure

- name: Make artefacts dir
run: |
mkdir -p ../assets

- name: Create archive
run: |
tar \
-zcf ../assets/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz ./*

- name: Create checksum
run: sha256sum ../assets/${{ github.event.repository.name }}-${{ github.ref_name }}.tar.gz > ../assets/checksum.txt

- name: Create a release in GitHub and uploads assets
run: |
gh release create ${{ github.ref_name }} --verify-tag --generate-notes ../assets/*.*
env:
GITHUB_TOKEN: ${{ github.TOKEN }}
shell: bash
6 changes: 4 additions & 2 deletions .github/workflows/php_upgrade.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
on: pull_request
name: Upgrade
name: PHP Upgrade Check
jobs:
test-composer-install:
runs-on: ubuntu-latest
env:
COMPOSER_ALLOW_SUPERUSER: 1
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -91,7 +93,7 @@ jobs:
runs-on: ubuntu-latest
services:
mariadb:
image: mariadb:latest
image: mariadb:lts
ports:
- 3306
env:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
on: pull_request
name: Review
name: Pull Request Review
jobs:
test-composer-install:
runs-on: ubuntu-latest
env:
COMPOSER_ALLOW_SUPERUSER: 1
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -141,7 +143,7 @@ jobs:
runs-on: ubuntu-latest
services:
mariadb:
image: mariadb:latest
image: mariadb:lts
ports:
- 3306
env:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
All notable changes to this project will be documented in this file.

## [Unreleased]
- Update docker build to publish to "os2display" org on docker hup. Update github workflow to latest actions.

## [1.2.8] - 2023-05-25
- [#145](https://github.com/os2display/display-api-service/pull/145)
Expand Down
28 changes: 0 additions & 28 deletions docker-compose.dev.yml

This file was deleted.

17 changes: 0 additions & 17 deletions docker-compose.redirect.yml

This file was deleted.

48 changes: 0 additions & 48 deletions docker-compose.server.yml

This file was deleted.

Loading