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 848c017 docker-compose setup now working with Roller 6 snapshot.
848c017 is described below
commit 848c01738f0cbf6304d0335f8d56f07ea6c5a68a
Author: Dave Johnson <[email protected]>
AuthorDate: Sat Jan 19 10:03:41 2019 -0500
docker-compose setup now working with Roller 6 snapshot.
---
README.md | 3 +++
deployment/docker-compose/Dockerfile | 3 ++-
.../{docker-compose.yml => build.sh} | 27 ++++------------------
deployment/docker-compose/docker-compose.yml | 2 +-
4 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index 19f2f68..3cb4005 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,9 @@ Rollarcus: bootstrap-ui branch
This branch __bootstrap-ui__ re-writes the Roller editor/admin user-interface
(UI) using Bootstrap.
+* There's an early access build here:
https://dist.apache.org/repos/dist/dev/roller/roller-6.0/v6.0.0/
+
+
Status
---
The Edit-Entry and Entries pages have been converted over and you can see
screen-shots of what they look like below.
diff --git a/deployment/docker-compose/Dockerfile
b/deployment/docker-compose/Dockerfile
index e3605fc..2dbbda6 100644
--- a/deployment/docker-compose/Dockerfile
+++ b/deployment/docker-compose/Dockerfile
@@ -27,7 +27,8 @@ ARG DATABASE_JDBC_PASSWORD=tiger
# get Roller from Apache mirror
WORKDIR /usr/local/roller
-RUN wget -O roller.tar.gz
http://www-us.apache.org/dist/roller/roller-5.2/v5.2.2/roller-release-5.2.2-standard.tar.gz
+RUN wget -O roller.tar.gz \
+
https://dist.apache.org/repos/dist/dev/roller/roller-6.0/v6.0.0/roller-release-6.0.0-SNAPSHOT-standard.tar.gz
RUN tar -xf roller.tar.gz
RUN ln -s roller-release-*/ release
diff --git a/deployment/docker-compose/docker-compose.yml
b/deployment/docker-compose/build.sh
old mode 100644
new mode 100755
similarity index 56%
copy from deployment/docker-compose/docker-compose.yml
copy to deployment/docker-compose/build.sh
index 11decd2..9b1b08c
--- a/deployment/docker-compose/docker-compose.yml
+++ b/deployment/docker-compose/build.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. The ASF licenses this file to You
@@ -15,29 +16,9 @@
# copyright in this work, please see the NOTICE file in the top level
# directory of this distribution.
-version: '3.2'
-services:
+TAG=roller:6.0.0-SNAPSHOT-1
- postgresql:
- image: "postgres:10.0"
- ports:
- - "5432:5432"
- volumes:
- - type: bind
- source:
/Users/dave/src/apache-roller/deployment/docker-compose/postgresql-data
- target: /var/lib/postgresql/data
- environment:
- - POSTGRES_DB=rollerdb
- - POSTGRES_USER=scott
- - POSTGRES_PASSWORD=tiger
-
- roller:
- image: "roller:6.0.0-SNAPSHOT"
- ports:
- - "8080:8080"
- volumes:
- - type: bind
- source:
/Users/dave/src/apache-roller/deployment/docker-compose/roller-data
- target: /var/lib/roller/data
+docker build . -t snoopdave/${TAG}
+docker push snoopdave/${TAG}
diff --git a/deployment/docker-compose/docker-compose.yml
b/deployment/docker-compose/docker-compose.yml
index 11decd2..59a37d4 100644
--- a/deployment/docker-compose/docker-compose.yml
+++ b/deployment/docker-compose/docker-compose.yml
@@ -33,7 +33,7 @@ services:
- POSTGRES_PASSWORD=tiger
roller:
- image: "roller:6.0.0-SNAPSHOT"
+ image: "snoopdave/roller:6.0.0-SNAPSHOT-1"
ports:
- "8080:8080"
volumes:
