Merge branch 'feature/envconfig' into develop

.goreleaser.yml

@@ -20,7 +20,7 @@ builds:
       - amd64
     goarm:
       - "6"
-    main: .
+    main: ./cmd/inbucket
     ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}}
   - binary: client
     goos:
@@ -46,9 +46,8 @@ archive:
     - LICENSE*
     - README*
     - CHANGELOG*
-    - inbucket.bat
     - etc/**/*
-    - themes/**/*
+    - ui/**/*
 fpm:
   bindir: /usr/local/bin
 snapshot:

CHANGELOG.md

@@ -18,6 +18,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Massive refactor of back-end code.  Inbucket should now be both easier and
   more enjoyable to work on.
+- Renamed `themes` directory to `ui` and eliminated the intermediate `bootstrap`
+  directory.
+- Docker build:
+  - Uses the same default ports as other builds; smtp:2500 http:9000 pop3:1100
+  - Uses volume `/config` for `greeting.html`
+  - Uses volume `/storage` for mail storage
 
 
 ## [v1.3.1] - 2018-03-10

Dockerfile

@@ -2,23 +2,30 @@
 # Inbucket website: http://www.inbucket.org/
 
 FROM golang:1.10-alpine
-MAINTAINER James Hillyerd, @jameshillyerd
 
-# Configuration (WORKDIR doesn't support env vars)
+# Configuration
 ENV INBUCKET_SRC $GOPATH/src/github.com/jhillyerd/inbucket
 ENV INBUCKET_HOME /opt/inbucket
-WORKDIR $INBUCKET_HOME
-ENTRYPOINT ["/con/context/start-inbucket.sh"]
-CMD ["/con/configuration/inbucket.conf"]
+ENV INBUCKET_SMTP_DOMAINNOSTORE bitbucket.local
+ENV INBUCKET_SMTP_TIMEOUT 30s
+ENV INBUCKET_POP3_TIMEOUT 30s
+ENV INBUCKET_WEB_UIDIR $INBUCKET_HOME/ui
+ENV INBUCKET_WEB_GREETINGFILE /config/greeting.html
+ENV INBUCKET_WEB_COOKIEAUTHKEY secret-inbucket-session-cookie-key
+ENV INBUCKET_STORAGE_TYPE file
+ENV INBUCKET_STORAGE_PARAMS path:/storage
+ENV INBUCKET_STORAGE_RETENTIONPERIOD 72h
+ENV INBUCKET_STORAGE_MAILBOXMSGCAP 300
 
 # Ports: SMTP, HTTP, POP3
-EXPOSE 10025 10080 10110
+EXPOSE 2500 9000 1100
+
+# Persistent Volumes
+VOLUME /config
+VOLUME /storage
 
-# Persistent Volumes, following convention at:
-#   https://github.com/docker/docker/issues/9277
-# NOTE /con/context is also used, not exposed by default
-VOLUME /con/configuration
-VOLUME /con/data
+WORKDIR $INBUCKET_HOME
+ENTRYPOINT "/start-inbucket.sh"
 
 # Build Inbucket
 COPY . $INBUCKET_SRC/