Skip to content

Commit a60b291

Browse files
committed
Fix the tag value in the build script
1 parent 69b8536 commit a60b291

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ MAINTAINER Miguel Moquillon "miguel.moquillon@silverpeas.org"
44

55
LABEL name="Silverpeas 6" description="Image to install and to run Silverpeas 6" vendor="Silverpeas"
66

7-
ARG SILVERPEAS_VERSION
8-
ARG WILDFLY_VERSION
7+
ARG SILVERPEAS_VERSION=6.0-SNAPSHOT
8+
ARG WILDFLY_VERSION=10.0.0
99
ARG DEFAULT_LOCALE=en_US.UTF-8
1010

1111
#

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ To create an image of Silverpeas 6 you have to specify the exact versions of Sil
1111
```
1212
$ ./build.sh 6.0 10.0.0
1313
```
14-
This builds an image containing Silverpeas 6.0 (not yet available) and Wildfly 10.0.0 with the tag `silverpeas-prod-6.0`. The versions passed as argument have to match the versions of Silverpeas and Wildfly available in the Web; indeed, Silverpeas and Wildfly are downloaded from their respective project Web site.
14+
This builds an image containing Silverpeas 6.0 (not yet available) and Wildfly 10.0.0 with the tag `silverpeas-prod:6.0`. The versions passed as argument have to match the versions of Silverpeas and Wildfly available in the Web; indeed, Silverpeas and Wildfly are downloaded from their respective project Web site.
1515

1616
## Container running
1717

@@ -43,7 +43,7 @@ $ docker run --name silverpeas -p 8080:8000 -d \
4343
-v /var/log/silverpeas:/opt/silverpeas/log \
4444
-v /var/lib/silverpeas:/opt/silverpeas/data \
4545
--link postgresql:database \
46-
silverpeas-prod-6.0
46+
silverpeas-prod:6.0
4747
```
4848
This image exposes the 8000 port at which Silverpeas is listening and this port is here mapped to the 8080 port of the host.
4949
It is recommended to mount the volumes `/opt/silverpeas/log` and `/opt/silverpeas/data` from the container. Indeed, the first volume contains the log files produced by the Silverpeas application whereas the second volume contains all the data that are managed by the users in Silverpeas. So, you can easily have a glance at the Silverpeas activity and you can switch to the next version of Silverpeas without losing the data. (Using a [Data Volume Container][data-volume] to map `/opt/silverpeas/log` and `/opt/silverpeas/data` is a better solution.)
@@ -55,7 +55,7 @@ $ docker run --name silverpeas -p 8080:8000 -d \
5555
-v /var/log/silverpeas:/opt/silverpeas/log \
5656
-v /var/lib/silverpeas:/opt/silverpeas/data \
5757
--link postgresql:database \
58-
silverpeas-prod-6.0
58+
silverpeas-prod:6.0
5959
```
6060
where `/etc/silverpeas/config.properties` is the Silverpeas global configuration file on the host.
6161

@@ -83,7 +83,7 @@ $ docker run --name silverpeas -p 8080:8000 -d \
8383
-v /etc/silverpeas/config.properties:/opt/silverpeas/configuration/config.properties \
8484
-v /var/log/silverpeas:/opt/silverpeas/log \
8585
-v /var/lib/silverpeas:/opt/silverpeas/data \
86-
silverpeas-prod-6.0
86+
silverpeas-prod:6.0
8787
```
8888
where `database` is the hostname on which run PostgreSQL and that is referred as such in the `config.properties`.
8989

@@ -103,7 +103,7 @@ $ docker create --name silverpeas-store \
103103
-v /opt/silverpeas/log \
104104
-v /opt/silverpeas/properties \
105105
-v /etc/silverpeas/config.properties:/opt/silverpeas/configuration/properties \
106-
silverpeas-prod-6.0 \
106+
silverpeas-prod:6.0 \
107107
/bin/true
108108
```
109109

@@ -112,7 +112,7 @@ Then to mount the volumes in the Silverpeas container:
112112
$ docker run --name silverpeas -p 8080:8000 -d \
113113
--link postgresql:database \
114114
--volumes-from silverpeas-store \
115-
silverpeas-prod-6.0
115+
silverpeas-prod:6.0
116116
```
117117

118118
If you have to customize the settings of Silverpeas or add, for example, a new database definition in Wildfly, then specify these settings with the Data Volume Container:
@@ -124,7 +124,7 @@ $ docker create --name silverpeas-store \
124124
-v /etc/silverpeas/config.properties:/opt/silverpeas/configuration/properties \
125125
-v /etc/silverpeas/CustomerSettings.xml:/opt/silverpeas/configuration/silverpeas/CustomerSettings.xml \
126126
-v /etc/silverpeas/my-datasource.cli:/opt/silverpeas/configuration/jboss/my-datasource.cli \
127-
silverpeas-prod-6.0 \
127+
silverpeas-prod:6.0 \
128128
/bin/true
129129
```
130130

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ wildfly_version=$2
1313
docker build \
1414
--build-arg SILVERPEAS_VERSION=$silverpeas_version \
1515
--build-arg WILDFLY_VERSION=$wildfly_version \
16-
-t silverpeas-prod-$silverpeas_version \
16+
-t silverpeas-prod:$silverpeas_version \
1717
.

0 commit comments

Comments
 (0)