Release 1.15.49 - See CHANGELOG.md

tiredofit · Jun 7, 2022 · bb2c29f · bb2c29f
1 parent c095b0b
commit bb2c29f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1 @@
+examples/
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
           if [ -n "${BRANCHTAG}" ] && [ -n "${GITTAG}" ]; then
             TAGS=${BRANCHTAG},${GITTAG}_php${RELEASE}
           else
-            TAGS="${BRANCHTAG},${GITTAG},${BRANCHTAG},${GITTAG}_php${RELEASE}"
+            TAGS="${BRANCHTAG}${GITTAG},${BRANCHTAG}${GITTAG}_php${RELEASE}"
           fi
 
           echo ::set-output name=tags::${TAGS}
@@ -90,6 +90,7 @@ jobs:
             sed -i "/FROM .*/a LABEL tiredofit.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
             if [ -f "CHANGELOG.md" ] ; then
               sed -i "/FROM .*/a LABEL tiredofit.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
+              mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
             fi
 
             if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -104,7 +105,7 @@ jobs:
       - name: Switch
         id: Switch
         run: |
-              sed -i "s|FROM docker.io/tiredofit/nginx-php-fpm:.*|FROM docker.io/tiredofit/nginx-php-fpm:${RELEASE}|g" Dockerfile
+            sed -i "s|FROM docker.io/tiredofit/nginx-php-fpm:.*|FROM docker.io/tiredofit/nginx-php-fpm:${RELEASE}|g" Dockerfile
 
       - name: Build
         uses: docker/build-push-action@v3

diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -90,6 +90,7 @@ jobs:
             sed -i "/FROM .*/a LABEL tiredofit.image_build_date=\"$(date +'%Y-%m-%d %H:%M:%S')\"" Dockerfile
             if [ -f "CHANGELOG.md" ] ; then
               sed -i "/FROM .*/a LABEL tiredofit.image.git_changelog_version=\"$(head -n1 ./CHANGELOG.md | awk '{print $2}')\"" Dockerfile
+              mkdir -p install/assets/.changelogs ; cp CHANGELOG.md install/assets/.changelogs/${GITHUB_REPOSITORY/\//_}.md
             fi
 
             if [[ $GITHUB_REF == refs/tags/* ]]; then
@@ -104,7 +105,7 @@ jobs:
       - name: Switch
         id: Switch
         run: |
-              sed -i "s|FROM docker.io/tiredofit/nginx-php-fpm:.*|FROM docker.io/tiredofit/nginx-php-fpm:${RELEASE}|g" Dockerfile
+            sed -i "s|FROM docker.io/tiredofit/nginx-php-fpm:.*|FROM docker.io/tiredofit/nginx-php-fpm:${RELEASE}|g" Dockerfile
 
       - name: Build
         uses: docker/build-push-action@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.15.49 2022-06-07 <dave at tiredofit dot ca>
+
+   ### Added
+      - Freescout 1.8.17
+
+
 ## 1.15.48 2022-05-24 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM docker.io/tiredofit/nginx-php-fpm:8.0
 LABEL maintainer="Dave Conroy (github.com/tiredofit)"
 
 ### Set Defaults
-ENV FREESCOUT_VERSION=1.8.16 \
+ENV FREESCOUT_VERSION=1.8.17 \
     FREESCOUT_REPO_URL=https://github.com/freescout-helpdesk/freescout \
     NGINX_WEBROOT=/www/html \
     PHP_CREATE_SAMPLE_PHP=FALSE \