Merge remote-tracking branch 'solidnerd/master'

neuroforgede · Sep 4, 2023 · fd00907 · fd00907
2 parents 7a475b2 + 6787e8e
commit fd00907
Show file tree

Hide file tree

Showing 7 changed files with 292 additions and 10 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -0,0 +1,125 @@
+name: "master"
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Set up CI Image Metadata
+      id: docker_meta_ci
+      uses: docker/metadata-action@v4
+      with:
+        images: solidnerd/bookstack-dev
+        tags: |
+          type=sha
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Build Image
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/amd64
+        push: false
+        tags: |
+          ${{ steps.docker_meta_ci.outputs.tags }}
+        labels: ${{ steps.docker_meta_ci.outputs.labels }}
+        cache-from: type=registry,ref=solidnerd/bookstack-dev:master
+        outputs: type=docker,dest=/tmp/image-bookstack.tar
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: image-bookstack-master
+        path: /tmp/image-bookstack.tar
+        if-no-files-found: warn
+
+  e2e:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Download artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: image-bookstack-master
+        path: /tmp
+
+    - name: Load Docker image
+      run: |
+        docker load --input /tmp/image-bookstack.tar
+        docker image ls -a
+
+  push:
+    runs-on: ubuntu-22.04
+    needs: e2e
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name:  Set up Docker Hub Image Metadata
+      id: docker_meta
+      uses: docker/metadata-action@v4
+      with:
+        images: solidnerd/bookstack,ghcr.io/solidnerd/docker-bookstack
+        tags: |
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{major}}.{{minor}}.{{patch}}
+          # Get "master" for master-branch changes
+          type=ref,event=branch
+
+    - name: Download artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: image-bookstack-master
+        path: /tmp
+        if-no-files-found: warn
+    - name: Load Docker image
+      run: |
+        docker load --input /tmp/image-bookstack.tar
+        docker image ls -a
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to DockerHub
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.CR_PAT }}
+
+    - name: Build and Push
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/amd64
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: |
+          ${{ steps.docker_meta.outputs.tags }}
+        labels: ${{ steps.docker_meta.outputs.labels }}
+        cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
+        cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,157 @@
+name: release
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '*' # Push on all tag events
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Set up CI Image Metadata
+      id: docker_meta_ci
+      uses: docker/metadata-action@v4
+      with:
+        images: solidnerd/bookstack-dev
+        tags: |
+          type=sha
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Build and push Dev
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/amd64
+        push: false
+        tags: |
+          ${{ steps.docker_meta_ci.outputs.tags }}
+        labels: ${{ steps.docker_meta_ci.outputs.labels }}
+        cache-from: type=registry,ref=solidnerd/bookstack-dev:master
+        outputs: type=docker,dest=/tmp/image-bookstack.tar
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: image-bookstack-master
+        path: /tmp/image-bookstack.tar
+
+  e2e:
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Download artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: image-bookstack-master
+        path: /tmp
+
+    - name: Load Docker image
+      run: |
+        docker load --input /tmp/image-bookstack.tar
+        docker image ls -a
+
+  push:
+    runs-on: ubuntu-22.04
+    needs: e2e
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name:  Set up Docker Hub Image Metadata
+      id: docker_meta
+      uses: docker/metadata-action@v4
+      with:
+        images: |
+          solidnerd/bookstack
+          ghcr.io/solidnerd/docker-bookstack
+        # Blanket-enable "latest" tagging for all of the releases that make it
+        # this far, as SemVer's pre-release tag is used as a build indicator
+        # for this project. Note that _actual_ semver build info is not used,
+        # as it is discarded by almost everything that consumes SemVer (as it
+        # should be).
+        flavor: |
+          latest=true
+        tags: |
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=semver,pattern={{major}}.{{minor}}.{{patch}}
+
+    - name: Download artifact
+      uses: actions/download-artifact@v3
+      with:
+        name: image-bookstack-master
+        path: /tmp
+
+    - name: Load Docker image
+      run: |
+        docker load --input /tmp/image-bookstack.tar
+        docker image ls -a
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v2
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
+    - name: Login to DockerHub
+      if: github.event_name != 'pull_request'
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.CR_PAT }}
+
+    - name: Build and Push master
+      uses: docker/build-push-action@v4
+      with:
+        context: .
+        file: ./Dockerfile
+        platforms: linux/amd64
+        push: ${{ github.event_name != 'pull_request' }}
+        tags: |
+          ${{ steps.docker_meta.outputs.tags }}
+        labels: ${{ steps.docker_meta.outputs.labels }}
+        cache-from: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
+        cache-to: type=registry,ref=solidnerd/bookstack-dev:${{ github.sha }}
+
+  create-release:
+    runs-on: ubuntu-22.04
+    needs: push
+    steps:
+      # To use this repository's private action, you must check out the repository
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Generate changelog
+        id: changelog
+        uses: metcalfc/[email protected]
+        with:
+          myToken: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create Release
+        id: create_release
+        uses: actions/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body: ${{ steps.changelog.outputs.changelog }}
+          draft: false
+          prerelease: false
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=23.06.2
+ENV BOOKSTACK_VERSION=23.08.1
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Forked from https://github.com/solidnerd/docker-bookstack with more frequent upd
 
 ## Current Version: [23.6.2](https://github.com/neuroforgede/docker-bookstack/blob/master/Dockerfile)
 
-Versions higher than 23.6.2 no longer use an in-container `.env` file for
+Versions higher than 23.8.1 no longer use an in-container `.env` file for
 environment variable management. Instead, the preferred approach is to manage
 them directly with the container runtime (e.g. Docker's `-e`). This is to
 simplify troubleshooting if and when errors occur. The most important change is
@@ -65,8 +65,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_23.6.2 \
-   solidnerd/bookstack:23.6.2
+   --name bookstack_23.8.1 \
+   solidnerd/bookstack:23.8.1
    ```
 
 ### Docker 1.9+
@@ -99,8 +99,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_23.6.2" \
-    solidnerd/bookstack:23.6.2
+   --name="bookstack_23.8.1" \
+    solidnerd/bookstack:23.8.1
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-23.6.2
+23.8.1
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -6,7 +6,7 @@ services:
     depends_on:
     - bookstack
   mysql:
-    image: mysql:8.0
+    image: mysql:8.1
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   mysql:
-    image: mysql:8.0
+    image: mysql:8.1
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: ghcr.io/neuroforgede/docker-bookstack:23.6.2
+    image: ghcr.io/neuroforgede/docker-bookstack:23.8.1
     depends_on:
     - mysql
     environment: