Merge pull request #983 from dsander/fix-docker-image

Include development group in docker build and switch default port

Dominik Sander 9 anni fa
parent
commit
c358b4f534
3 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 1 1
      docker/Dockerfile
  2. 3 3
      docker/README.md
  3. 1 1
      docker/scripts/setup

+ 1 - 1
docker/Dockerfile

@@ -26,7 +26,7 @@ RUN /scripts/setup
26 26
 
27 27
 VOLUME /var/lib/mysql
28 28
 
29
-EXPOSE 5000
29
+EXPOSE 3000
30 30
 
31 31
 CMD ["/scripts/init"]
32 32
 

+ 3 - 3
docker/README.md

@@ -47,7 +47,7 @@ The CMD launches Huginn via the scripts/init script. This may become the ENTRYPO
47 47
 
48 48
 Simple stand-alone usage:
49 49
 
50
-    docker run -it -p 5000:5000 cantino/huginn
50
+    docker run -it -p 3000:3000 cantino/huginn
51 51
 
52 52
 To link to another mysql container, for example:
53 53
 
@@ -57,7 +57,7 @@ To link to another mysql container, for example:
57 57
         -e HUGINN_MYSQL_PASSWORD=somethingsecret \
58 58
         -e HUGINN_MYSQL_ROOT_PASSWORD=somethingevenmoresecret \
59 59
         cantino/huginn
60
-    docker run --rm --name huginn --link newcentury_mysql:MYSQL -p 5000:5000 \
60
+    docker run --rm --name huginn --link newcentury_mysql:MYSQL -p 3000:3000 \
61 61
         -e HUGINN_DATABASE_NAME=huginn \
62 62
         -e HUGINN_DATABASE_USER=huginn \
63 63
         -e HUGINN_DATABASE_PASSWORD=somethingsecret \
@@ -65,7 +65,7 @@ To link to another mysql container, for example:
65 65
 
66 66
 To link to another container named 'postgres':
67 67
 
68
-    docker run --rm --name huginn --link POSTGRES:mysql -p 5000:5000 -e "DATABASE_USER=huginn" -e "DATABASE_PASSWORD=pass@word" cantino/huginn
68
+    docker run --rm --name huginn --link POSTGRES:mysql -p 3000:3000 -e "DATABASE_USER=huginn" -e "DATABASE_PASSWORD=pass@word" cantino/huginn
69 69
 
70 70
 ## Environment Variables
71 71
 

+ 1 - 1
docker/scripts/setup

@@ -29,7 +29,7 @@ if [ -d "/scripts/cache" ]; then
29 29
   mv /scripts/cache vendor/
30 30
   chown -R huginn:huginn vendor/cache
31 31
 fi
32
-sudo -u huginn -H bundle install --deployment --without development test
32
+sudo -u huginn -H bundle install --deployment --without test
33 33
 
34 34
 # silence setlocale message (THANKS DEBIAN!)
35 35
 cat > /etc/default/locale <<EOF