From: Michael R Sweet <msweet@msweet.org>
Date: Fri, 5 Apr 2024 20:17:10 +0000 (-0400)
Subject: Tweak Docker docos.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f1ea38d43bd60b59378a941e9bc46ed5e3e361b;p=thirdparty%2Fcups.git

Tweak Docker docos.
---

diff --git a/CHANGES.md b/CHANGES.md
index f40e81f01f..f50d3b0a1a 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -16,6 +16,7 @@ Changes in CUPS v2.5b1 (TBA)
   to get successfully printed jobs (Issue #830)
 - Added driver filter to web interface (Issue #848)
 - Added support for PAM modules password-auth and system-auth (Issue #892)
+- Added Docker support (Issue #929)
 - Updated CUPS to require TLS support - OpenSSL, GNUTLS and LibreSSL are
   supported.
 - Updated CUPS to require ZLIB.
diff --git a/DOCKER.md b/DOCKER.md
new file mode 100644
index 0000000000..fce831d20f
--- /dev/null
+++ b/DOCKER.md
@@ -0,0 +1,43 @@
+Creating an OpenPrinting CUPS Docker Image
+==========================================
+
+Prerequisites
+-------------
+
+- Install Docker on your system
+
+
+Building and Running
+--------------------
+
+To build and run CUPS using Docker, follow these steps:
+
+1. Clone this repository to your local machine.
+
+2. Navigate to the root directory of the cloned repository.
+
+3. Run the following command to start the Docker containers in the background:
+
+   ```
+   docker-compose up -d
+   ```
+
+4. To start interactive terminal in container
+
+    ```
+    docker exec -it cups /bin/bash
+    ```
+
+
+Additional Information
+----------------------
+
+1. Use 'admin' as CUPS username and 'admin' as password.
+
+2. You can find the CUPS configuration files and log files in the docker-config
+   directory of the repository on your local machine. Any changes made to these
+   files will be reflected in the CUPS service running inside the Docker
+   container.
+
+3. The CUPS web interface is accessible at http://localhost:631 from your web
+   browser.
diff --git a/INSTALL.md b/INSTALL.md
index 0bfebce3e7..452baadd66 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -185,35 +185,3 @@ logging:
   the messages to stderr.  Prefix a filename with "+" to append to an existing
   file.  You can include a single "%d" in the filename to embed the current
   process ID.
-
-Build Using Docker
-------------------
-
-### Prerequisites
-
-- Docker installed on your system
-
-### Build and Run
-
-To build and run CUPS using Docker, follow these steps:
-
-1. Clone this repository to your local machine.
-
-2. Navigate to the root directory of the cloned repository.
-
-3. Run the following command to start the Docker containers in the background:
-
-   ```bash
-   docker-compose up -d
-   ```
-
-4. To start interactive terminal in container
-    ```bash
-    docker exec -it cups /bin/bash
-    ```
-### Additional Information
-1. Use 'admin' as CUPS username and 'admin' as password.
-
-2. You can find the CUPS configuration files and log files in the docker-config directory of the repository on your local machine. Any changes made to these files will be reflected in the CUPS service running inside the Docker container.
-
-3. The CUPS web interface is accessible at http://localhost:631 from your web browser.
\ No newline at end of file