diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e7448e64..c0f69e6b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -140,7 +140,7 @@ jobs: - name: Generate changelog id: changelog - uses: metcalfc/changelog-generator@v4.3.1 + uses: metcalfc/changelog-generator@v4.6.2 with: myToken: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index 573b7961..23fbde4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3 AS bookstack -ENV BOOKSTACK_VERSION=v25.02 +ENV BOOKSTACK_VERSION=v25.05 RUN apk add --no-cache curl tar RUN set -x; \ curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/${BOOKSTACK_VERSION}.tar.gz \ @@ -7,7 +7,7 @@ RUN set -x; \ && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \ && rm bookstack.tar.gz -FROM php:8.3-apache-bookworm AS final +FROM php:8.4-apache-bookworm AS final RUN set -x; \ apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/README.md b/README.md index 4be5d8a5..ce2473f8 100644 --- a/README.md +++ b/README.md @@ -48,32 +48,6 @@ If you have any issues feel free to create an [issue on GitHub](https://github.c Note that if you want to use LDAP, `$` has to be escape like `\$`, i.e. `-e "LDAP_USER_FILTER"="(&(uid=\${user}))"` -Networking changed in Docker v1.9, so you need to do one of the following steps. - -### Docker < v1.9 - -1. MySQL Container: - - ```bash - docker run -d \ - -p 3306:3306 \ - -e MYSQL_ROOT_PASSWORD=secret \ - -e MYSQL_DATABASE=bookstack \ - -e MYSQL_USER=bookstack \ - -e MYSQL_PASSWORD=secret \ - --name bookstack_db \ - mysql:5.7.21 - ``` - -2. BookStack Container: - - ```bash - docker run -d --link bookstack_db_:mysql \ - -p 8080:8080 \ - --name bookstack_24.12.1 \ - solidnerd/bookstack:24.12.1 - ``` - ### Docker 1.9+ 1. Create a shared network: @@ -91,7 +65,7 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. -e MYSQL_USER=bookstack \ -e MYSQL_PASSWORD=secret \ --name="bookstack_db" \ - mysql:5.7.21 + mysql:9.2.0 ``` 3. Run BookStack Container @@ -102,16 +76,17 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. -e DB_DATABASE=bookstack \ -e DB_USERNAME=bookstack \ -e DB_PASSWORD=secret \ - -e APP_URL=http://example.com \ + -e APP_URL=http://localhost:8080 \ + -e APP_KEY=SomeRandomStringWith32Characters \ -p 8080:8080 \ - --name="bookstack_24.12.1" \ - solidnerd/bookstack:24.12.1 + --name="bookstack_25.5.0" \ + solidnerd/bookstack:25.5.0 ``` The APP_URL parameter should be the base URL for your BookStack instance without - a trailing slash. For example: + a trailing slash, but including any port numbers. For example: - `APP_URL=http://example.com` + `APP_URL=http://example.com` or `APP_URL=http://localhost:8080`. The following environment variables are required for Bookstack to start: - `APP_KEY` @@ -123,19 +98,15 @@ Networking changed in Docker v1.9, so you need to do one of the following steps. ### Volumes -To access your `.env` file and important bookstack folders on your host system -change `` in the following line to your host directory and add it then to -your run command: +To access your important bookstack folders on your host system change `` +in the following line to your host directory and add it then to your run +command: ```bash ---mount type=bind,source=/.env,target=/var/www/bookstack/.env \ -v :/var/www/bookstack/public/uploads \ -v :/var/www/bookstack/storage/uploads ``` -In case of a windows host machine the .env file has to be already created in the -host directory otherwise a folder named .env will be created. - After these steps you can visit [http://localhost:8080](http://localhost:8080). You can login with username `admin@admin.com` and password `password`. diff --git a/VERSION b/VERSION index 58dde6ec..722c6899 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.12.1 +25.5.0 diff --git a/docker-compose.test.yml b/docker-compose.test.yml index 12b773a9..7caf048f 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -6,7 +6,7 @@ services: depends_on: - bookstack mysql: - image: mysql:8.3 + image: mysql:9.2 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack diff --git a/docker-compose.yml b/docker-compose.yml index 1f6c903d..ddae8637 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '2' services: mysql: - image: mysql:8.3 + image: mysql:9.2 environment: - MYSQL_ROOT_PASSWORD=secret - MYSQL_DATABASE=bookstack @@ -11,7 +11,7 @@ services: - mysql-data:/var/lib/mysql bookstack: - image: solidnerd/bookstack:24.12.1 + image: solidnerd/bookstack:25.5.0 depends_on: - mysql environment: @@ -19,8 +19,12 @@ services: - DB_DATABASE=bookstack - DB_USERNAME=bookstack - DB_PASSWORD=secret - #set the APP_ to the URL of bookstack without without a trailing slash APP_URL=https://example.com - - APP_URL=http://example.com + # Set the APP_ to the URL of bookstack without without a trailing slash, + # but including any port numbers. For example, one of: + # APP_URL=https://example.com + # APP_URL=http://localhost:8080 + # APP_URL=https://wiki.example.com:8443 + - APP_URL=http://localhost:8080 # APP_KEY is used for encryption where needed, so needs to be persisted to # preserve decryption abilities. # Can run `php artisan key:generate` to generate a key