Skip to content

Commit 83163c6

Browse files
committed
adjustments to make 3.x docs deploy work
1 parent a908336 commit 83163c6

File tree

5 files changed

+33
-7
lines changed

5 files changed

+33
-7
lines changed

.github/workflows/deploy_docs_3x.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: 'deploy_docs_3x'
3+
4+
on:
5+
push:
6+
branches:
7+
- 3.x
8+
workflow_dispatch:
9+
10+
jobs:
11+
deploy:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Cloning repo
15+
uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 0
18+
19+
- name: Push to dokku
20+
uses: dokku/github-action@master
21+
with:
22+
git_remote_url: 'ssh://[email protected]:22/bake-docs-3'
23+
ssh_private_key: ${{ secrets.DOKKU_SSH_PRIVATE_KEY }}

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Basic docker based environment
22
# Necessary to trick dokku into building the documentation
33
# using dockerfile instead of herokuish
4-
FROM ubuntu:17.04
4+
FROM ubuntu:22.04
55

66
# Add basic tools
77
RUN apt-get update && \
@@ -13,9 +13,11 @@ RUN apt-get update && \
1313
libffi-dev \
1414
libssl-dev
1515

16+
# Prevent interactive timezone input
17+
ENV DEBIAN_FRONTEND=noninteractive
1618
RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \
1719
apt-get update && \
18-
apt-get install -y php7.2-cli php7.2-mbstring php7.2-xml php7.2-zip php7.2-intl php7.2-opcache php7.2-sqlite
20+
apt-get install -y php8.1-cli php8.1-mbstring php8.1-xml php8.1-zip php8.1-intl php8.1-opcache php8.1-sqlite
1921

2022
WORKDIR /code
2123

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ composer require --dev cakephp/bake
2020

2121
## Documentation
2222

23-
You can find the documentation for bake [on its own cookbook](https://book.cakephp.org/bake/2).
23+
You can find the documentation for bake [on its own cookbook](https://book.cakephp.org/bake/3).
2424

2525
## Testing
2626

docs.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ FROM ghcr.io/cakephp/docs-builder:runtime as runtime
1313
# Configure search index script
1414
ENV LANGS="en es fr ja pt ru"
1515
ENV SEARCH_SOURCE="/usr/share/nginx/html"
16-
ENV SEARCH_URL_PREFIX="/bake/2"
16+
ENV SEARCH_URL_PREFIX="/bake/3"
1717

1818
COPY --from=builder /data/docs /data/docs
1919
COPY --from=builder /data/website /data/website

docs/config/all.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
#
1111

1212
# The full version, including alpha/beta/rc tags.
13-
release = '2.x'
13+
release = '3.x'
1414

1515
# The search index version.
16-
search_version = 'bake-2'
16+
search_version = 'bake-3'
1717

1818
# The marketing display name for the book.
1919
version_name = ''
@@ -24,7 +24,8 @@
2424
# Other versions that display in the version picker menu.
2525
version_list = [
2626
{'name': '1.x', 'number': '/bake/1.x', 'title': '1.x'},
27-
{'name': '2.x', 'number': '/bake/2.x', 'title': '2.x', 'current': True},
27+
{'name': '2.x', 'number': '/bake/2.x', 'title': '2.x'},
28+
{'name': '3.x', 'number': '/bake/3.x', 'title': '3.x', 'current': True},
2829
]
2930

3031
# Languages available.

0 commit comments

Comments
 (0)