roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [roller] branch bootstrap-ui updated: License headers
Date Fri, 18 Jan 2019 13:00:11 GMT
This is an automated email from the ASF dual-hosted git repository.

snoopdave pushed a commit to branch bootstrap-ui
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/bootstrap-ui by this push:
     new 6981c3a  License headers
6981c3a is described below

commit 6981c3a64bbf034b2252f37f6335f21a6f1d892c
Author: Dave Johnson <snoopdave@gmail.com>
AuthorDate: Fri Jan 18 08:00:00 2019 -0500

    License headers
---
 deployment/docker-compose/Dockerfile         |  1 +
 deployment/docker-compose/README.md          |  5 ++++-
 deployment/docker-compose/docker-compose.yml | 17 +++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/deployment/docker-compose/Dockerfile b/deployment/docker-compose/Dockerfile
index eb717c0..e3605fc 100644
--- a/deployment/docker-compose/Dockerfile
+++ b/deployment/docker-compose/Dockerfile
@@ -1,3 +1,4 @@
+
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  The ASF licenses this file to You
 # under the Apache License, Version 2.0 (the "License"); you may not
diff --git a/deployment/docker-compose/README.md b/deployment/docker-compose/README.md
index 4a8d593..bfc318a 100644
--- a/deployment/docker-compose/README.md
+++ b/deployment/docker-compose/README.md
@@ -1 +1,4 @@
-# Deploy
\ No newline at end of file
+# Running Roller with Docker Compose
+
+This example shows how to run Roller locally with Docker Compose.
+
diff --git a/deployment/docker-compose/docker-compose.yml b/deployment/docker-compose/docker-compose.yml
index 220bb94..11decd2 100644
--- a/deployment/docker-compose/docker-compose.yml
+++ b/deployment/docker-compose/docker-compose.yml
@@ -1,3 +1,20 @@
+
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  The ASF licenses this file to You
+# under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.  For additional information regarding
+# copyright in this work, please see the NOTICE file in the top level
+# directory of this distribution.
+
 version: '3.2'
 
 services:


Mime
View raw message