Merge branch 'master' into patch-1

backdrop-ops · Jan 3, 2025 · a5cd17c · a5cd17c
2 parents ae8babb + 4f986f4
commit a5cd17c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/1/apache/Dockerfile b/1/apache/Dockerfile
@@ -24,7 +24,5 @@ RUN curl -fSL "https://github.com/backdrop/backdrop/archive/refs/tags/${BACKDROP
 # Add custom entrypoint to set BACKDROP_SETTINGS correctly
 COPY docker-entrypoint.sh /entrypoint.sh
 
-EXPOSE 80
-
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/1/fpm/Dockerfile b/1/fpm/Dockerfile
@@ -22,7 +22,5 @@ RUN curl -fSL "https://github.com/backdrop/backdrop/archive/${BACKDROP_VERSION}.
 # Add custom entrypoint to set BACKDROP_SETTINGS correctly
 COPY docker-entrypoint.sh /entrypoint.sh
 
-EXPOSE 80
-
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["php-fpm"]
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ services:
     image: backdrop:latest
     container_name: backdrop
     ports:
-      - 8088:80
+    - 8080:80
     environment:
       BACKDROP_DB_HOST: mysql
       BACKDROP_DB_USER: backdrop
@@ -261,5 +261,4 @@ View [license information](https://www.drupal.org/licensing/faq) for the softwar
 - [Backdrop CMS Documentation](https://docs.backdropcms.org/)
 
 ## Contributing
-- [Contribute to the Backdrop CMS Open Source Project](https://docs.backdropcms.org/documentation/contributors-guide)
-
+- [Contribute to the Backdrop CMS Open Source Project](https://docs.backdropcms.org/documentation/contributors-guide)