Merge pull request #638 from cakephp/3.x-docker

adjust 3.x dockerfiles
cakephp · Sep 14, 2023 · 81f4492 · 81f4492
2 parents 62f6235 + 45a0c3b
commit 81f4492
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # Basic docker based environment
 # Necessary to trick dokku into building the documentation
 # using dockerfile instead of herokuish
-FROM ubuntu:17.04
+FROM ubuntu:22.04
 
 # Add basic tools
 RUN apt-get update && \
@@ -13,9 +13,11 @@ RUN apt-get update && \
     libffi-dev \
     libssl-dev
 
+# Prevent interactive timezone input
+ENV DEBIAN_FRONTEND=noninteractive
 RUN LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php && \
   apt-get update && \
-  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
+  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
 
 WORKDIR /code
 

diff --git a/docs.Dockerfile b/docs.Dockerfile
@@ -14,7 +14,7 @@ FROM markstory/cakephp-docs-builder:runtime as runtime
 # Configure search index script
 ENV LANGS="en es fr ja"
 ENV SEARCH_SOURCE="/usr/share/nginx/html"
-ENV SEARCH_URL_PREFIX="/authentication/2"
+ENV SEARCH_URL_PREFIX="/authentication/3"
 
 COPY --from=builder /data/docs /data/docs
 COPY --from=builder /data/website /data/website