From b0b80b84ca86ebfccf0f713bbcc49e3d87e01996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 17:00:33 +0200 Subject: [PATCH 1/2] DISPLAY-986: Fix incorrect values in auto build release.json in images --- .github/workflows/itkdev_docker_build_develop.yml | 10 +++++++++- .github/workflows/itkdev_docker_build_tag.yml | 8 ++++++++ .github/workflows/os2display_docker_build_develop.yml | 10 +++++++++- .github/workflows/os2display_docker_build_tag.yml | 8 ++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.github/workflows/itkdev_docker_build_develop.yml b/.github/workflows/itkdev_docker_build_develop.yml index 91327d2c8..e1981252c 100644 --- a/.github/workflows/itkdev_docker_build_develop.yml +++ b/.github/workflows/itkdev_docker_build_develop.yml @@ -32,13 +32,21 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Set release timestamp + run: | + echo "APP_RELEASE_TIMESTAMP=$(echo $(date +%s))" >> $GITHUB_ENV + echo "APP_RELEASE_TIME=$(echo $(date))" >> $GITHUB_ENV + - name: Build and push (API) uses: docker/build-push-action@v4 with: context: ./infrastructure/itkdev/ file: ./infrastructure/itkdev/Dockerfile build-args: | - APP_VERSION=${{ env.APP_VERSION }} + APP_VERSION=${{ github.ref }} + APP_RELEASE_VERSION=$GITHUB_REF_NAME + APP_RELEASE_TIMESTAMP=${{ env.APP_RELEASE_TIMESTAMP }} + APP_RELEASE_TIME=${{ env.APP_RELEASE_TIME }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/itkdev_docker_build_tag.yml b/.github/workflows/itkdev_docker_build_tag.yml index be6aebfa4..ac42f5312 100644 --- a/.github/workflows/itkdev_docker_build_tag.yml +++ b/.github/workflows/itkdev_docker_build_tag.yml @@ -29,6 +29,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Set release timestamp + run: | + echo "APP_RELEASE_TIMESTAMP=$(echo $(date +%s))" >> $GITHUB_ENV + echo "APP_RELEASE_TIME=$(echo $(date))" >> $GITHUB_ENV + - name: Build and push (API) uses: docker/build-push-action@v4 with: @@ -36,6 +41,9 @@ jobs: file: ./infrastructure/itkdev/Dockerfile build-args: | APP_VERSION=${{ github.ref }} + APP_RELEASE_VERSION=$GITHUB_REF_NAME + APP_RELEASE_TIMESTAMP=${{ env.APP_RELEASE_TIMESTAMP }} + APP_RELEASE_TIME=${{ env.APP_RELEASE_TIME }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/os2display_docker_build_develop.yml b/.github/workflows/os2display_docker_build_develop.yml index dad72d341..6fce7392d 100644 --- a/.github/workflows/os2display_docker_build_develop.yml +++ b/.github/workflows/os2display_docker_build_develop.yml @@ -32,13 +32,21 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Set release timestamp + run: | + echo "APP_RELEASE_TIMESTAMP=$(echo $(date +%s))" >> $GITHUB_ENV + echo "APP_RELEASE_TIME=$(echo $(date))" >> $GITHUB_ENV + - name: Build and push (API) uses: docker/build-push-action@v4 with: context: ./infrastructure/os2display/ file: ./infrastructure/os2display/Dockerfile build-args: | - APP_VERSION=${{ env.APP_VERSION }} + APP_VERSION=${{ github.ref }} + APP_RELEASE_VERSION=$GITHUB_REF_NAME + APP_RELEASE_TIMESTAMP=${{ env.APP_RELEASE_TIMESTAMP }} + APP_RELEASE_TIME=${{ env.APP_RELEASE_TIME }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/os2display_docker_build_tag.yml b/.github/workflows/os2display_docker_build_tag.yml index 2acc25aa4..9bac5ab6f 100644 --- a/.github/workflows/os2display_docker_build_tag.yml +++ b/.github/workflows/os2display_docker_build_tag.yml @@ -29,6 +29,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 + - name: Set release timestamp + run: | + echo "APP_RELEASE_TIMESTAMP=$(echo $(date +%s))" >> $GITHUB_ENV + echo "APP_RELEASE_TIME=$(echo $(date))" >> $GITHUB_ENV + - name: Build and push (API) uses: docker/build-push-action@v4 with: @@ -36,6 +41,9 @@ jobs: file: ./infrastructure/os2display/Dockerfile build-args: | APP_VERSION=${{ github.ref }} + APP_RELEASE_VERSION=$GITHUB_REF_NAME + APP_RELEASE_TIMESTAMP=${{ env.APP_RELEASE_TIMESTAMP }} + APP_RELEASE_TIME=${{ env.APP_RELEASE_TIME }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From 1c6ccadb38997a2c40e9369d56faa94955740295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ture=20Gj=C3=B8rup?= Date: Tue, 11 Jul 2023 17:02:54 +0200 Subject: [PATCH 2/2] DISPLAY-986: Updated Changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a94770fb8..7d567c1da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. ## [Unreleased] +## [1.3.2] - 2023-07-11 + +- [#207](https://github.com/os2display/display-admin-client/pull/207) + Fix incorrect values in auto build release.json in images + ## [1.3.1] - 2023-07-11 - [#206](https://github.com/os2display/display-admin-client/pull/206)