Skip to content

Commit c5b0bb4

Browse files
authored
Merge pull request #134 from cakephp/cake5-docs
adjustments to make 2.x docs deploy work
2 parents dad7193 + 32025b6 commit c5b0bb4

File tree

5 files changed

+32
-8
lines changed

5 files changed

+32
-8
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: 'deploy_docs_2x'
3+
4+
on:
5+
push:
6+
branches:
7+
- cake5
8+
workflow_dispatch:
9+
10+
jobs:
11+
deploy:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Cloning repo
15+
uses: actions/checkout@v3
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/queue-docs-2'
23+
ssh_private_key: ${{ secrets.DOKKU_SSH_PRIVATE_KEY }}

Dockerfile

Lines changed: 2 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 && \
@@ -14,7 +14,7 @@ RUN apt-get update && \
1414
libssl-dev && \
1515
LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \
1616
apt-get update && \
17-
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 &&\
17+
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 &&\
1818
apt-get clean &&\
1919
rm -rf /var/lib/apt/lists/*
2020

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ Additionally, you will need to configure the ``default`` queue configuration in
4545

4646
## Documentation
4747

48-
Full documentation of the plugin can be found on the [CakePHP Cookbook](https://book.cakephp.org/queue/1/).
48+
Full documentation of the plugin can be found on the [CakePHP Cookbook](https://book.cakephp.org/queue/2/).

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"
1515
ENV SEARCH_SOURCE="/usr/share/nginx/html"
16-
ENV SEARCH_URL_PREFIX="/queue/1"
16+
ENV SEARCH_URL_PREFIX="/queue/2"
1717

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

docs/config/all.py

Lines changed: 5 additions & 4 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 = '1.x'
13+
release = '2.x'
1414

1515
# The search index version.
16-
search_version = 'queue-1'
16+
search_version = 'queue-2'
1717

1818
# The marketing display name for the book.
1919
version_name = ''
@@ -23,7 +23,8 @@
2323

2424
# Other versions that display in the version picker menu.
2525
version_list = [
26-
{'name': '1.x', 'number': '/queue/1/', 'title': '1.x', 'current': True},
26+
{'name': '1.x', 'number': '/queue/1/', 'title': '1.x'},
27+
{'name': '2.x', 'number': '/queue/2/', 'title': '2.x', 'current': True},
2728
]
2829

2930
# Languages available.
@@ -34,7 +35,7 @@
3435
branch = 'master'
3536

3637
# Current version being built
37-
version = '1.x'
38+
version = '2.x'
3839

3940
show_root_link = True
4041

0 commit comments

Comments
 (0)