Merge branch 'release/3.0.0'

Update CHANGELOG for final 3.0.0
Merge tag 'v3.0.0-rc4' into develop
2025-12-17 17:47:03 +00:00 · 2021-10-02 10:52:59 -07:00 · 2021-09-19 11:34:43 -07:00 · 2021-08-22 13:37:26 -07:00 · 2021-08-22 13:36:32 -07:00 · 2021-08-22 13:32:47 -07:00
8 changed files with 78 additions and 20 deletions
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -6,7 +6,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        go: [ '1.16', '1.15' ]
+        go: [ '1.17', '1.16' ]
    name: Go ${{ matrix.go }} build
    steps:
      - uses: actions/checkout@v2
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,15 +1,49 @@
 name: Docker Image
 on:
  push:
-    branches: [ "master", "develop" ]
+    branches: [ "develop" ]
+    tags: [ "v*" ]
  pull_request:
 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
-      - uses: docker/build-push-action@v1
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
        with:
-          repository: inbucket/inbucket
-          push: false
-          tag_with_ref: true
+          images: |
+            inbucket/inbucket
+            ghcr.io/${{ github.repository }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=sha
+            type=edge,branch=develop
+          flavor: |
+            latest=auto
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,7 +14,7 @@ jobs:
      - name: Setup Go
        uses: actions/setup-go@v2
        with:
-          go-version: 1.16
+          go-version: 1.17
      - name: Setup Node.js
        uses: actions/setup-node@v1
        with:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,26 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased]


+## [v3.0.0] - 2021-09-19
+
+Unchanged from rc4.
+
+
+## [v3.0.0-rc4] - 2021-08-22
+
+### Fixed
+- Various MIME header decoding improvements
+
+### Changed
+- Bump Go version to 1.17 (#233)
+
+
+## v3.0.0-rc3 - 2021-08-01
+
+Unchanaged from 3.0.0-rc2.  This release is to update our build automation and
+tags for Docker Hub and ghcr.io.
+
+
 ## [v3.0.0-rc2] - 2021-07-31

 ### Added
@@ -254,6 +274,8 @@ No change from beta1.
  specific message.

 [Unreleased]:   https://github.com/inbucket/inbucket/compare/master...develop
+[v3.0.0]:   https://github.com/inbucket/inbucket/compare/v3.0.0-rc4...v3.0.0
+[v3.0.0-rc4]:   https://github.com/inbucket/inbucket/compare/v3.0.0-rc2...v3.0.0-rc4
 [v3.0.0-rc2]:   https://github.com/inbucket/inbucket/compare/v3.0.0-rc1...v3.0.0-rc2
 [v3.0.0-rc1]:   https://github.com/inbucket/inbucket/compare/v3.0.0-beta3...v3.0.0-rc1
 [v3.0.0-beta3]: https://github.com/inbucket/inbucket/compare/v3.0.0-beta2...v3.0.0-beta3
--- a/4
+++ b/4
@@ -1,7 +1,7 @@
 # Docker build file for Inbucket: https://www.inbucket.org/

 # Install build-time dependencies
-FROM golang:1.16-alpine3.13 as builder
+FROM golang:1.17-alpine3.14 as builder
 RUN apk add --no-cache --virtual .build-deps g++ git make npm python3
 WORKDIR /build
 COPY . .
@@ -24,7 +24,7 @@ WORKDIR /build/ui
 RUN npm run build

 # Run in minimal image
-FROM alpine:3.13
+FROM alpine:3.14
 RUN apk --no-cache add tzdata
 WORKDIR /opt/inbucket
 RUN mkdir bin defaults ui
--- a/go.mod
+++ b/go.mod
@@ -6,14 +6,15 @@ require (
 	github.com/gorilla/css v1.0.0
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.4.2
-	github.com/jhillyerd/enmime v0.9.1
+	github.com/jhillyerd/enmime v0.9.2
 	github.com/jhillyerd/goldiff v0.1.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/mattn/go-runewidth v0.0.13 // indirect
 	github.com/microcosm-cc/bluemonday v1.0.15
 	github.com/rs/zerolog v1.23.0
 	github.com/stretchr/testify v1.7.0
-	golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985
+	golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
+	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

--- a/go.sum
+++ b/go.sum
@@ -22,8 +22,8 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 h1:g0fAGBisHaEQ0TRq1iBvemFRf+8AEWEmBESSiWB3Vsc=
 github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod h1:CVKlgaMiht+LXvHG173ujK6JUhZXKb2u/BQtjPDIvyk=
-github.com/jhillyerd/enmime v0.9.1 h1:HcC2WZA6dMCobs8WeyF/6FRSvdRCrr8O+UiLBae4eNE=
-github.com/jhillyerd/enmime v0.9.1/go.mod h1:S5ge4lnv/dDDBbAWwtoOFlj14NHiXdw/EqMB2lJz3b8=
+github.com/jhillyerd/enmime v0.9.2 h1:Njvy7yubcX21WaM+kWdVxGFJ99Rk6xHqgon3Ep++qDw=
+github.com/jhillyerd/enmime v0.9.2/go.mod h1:S5ge4lnv/dDDBbAWwtoOFlj14NHiXdw/EqMB2lJz3b8=
 github.com/jhillyerd/goldiff v0.1.0 h1:7JzKPKVwAg1GzrbnsToYzq3Y5+S7dXM4hgEYiOzaf4A=
 github.com/jhillyerd/goldiff v0.1.0/go.mod h1:WeDal6DTqhbMhNkf5REzWCIvKl3JWs0Q9omZ/huIWAs=
 github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
@@ -61,8 +61,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210501142056-aec3718b3fa0/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c=
+golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -74,8 +74,9 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -7020,9 +7020,9 @@
      }
    },
    "url-parse": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-      "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+      "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
      "dev": true,
      "requires": {
        "querystringify": "^2.1.1",
Author	SHA1	Message	Date
James Hillyerd	cb6f99c487	Merge branch 'release/3.0.0'	2021-10-02 10:52:59 -07:00
James Hillyerd	04fb58e15e	Update CHANGELOG for final 3.0.0	2021-09-19 11:34:43 -07:00
James Hillyerd	f11ad55474	Merge tag 'v3.0.0-rc4' into develop v3.0.0-rc4 Fixed - Various MIME header decoding improvements Changed - Bump Go version to 1.17 (#233)	2021-08-22 13:37:26 -07:00
James Hillyerd	26939f2bf6	Merge branch 'release/3.0.0-rc4'	2021-08-22 13:36:32 -07:00
James Hillyerd	05a3b1742a	Update CHANGELOG for rc4	2021-08-22 13:32:47 -07:00
James Hillyerd	867d5f5d7f	Update npm deps (#235 )	2021-08-22 13:25:42 -07:00
James Hillyerd	8e34a21dc6	Update Go dependencies, incl enmime (#234 )	2021-08-22 12:54:26 -07:00
James Hillyerd	8869acef0b	Bump Go to 1.17 (#233 ) * Bump Go to 1.17 * update chglog	2021-08-22 12:31:13 -07:00
James Hillyerd	752d5c9668	docker: tag versions with `latest` (#232 )	2021-08-07 10:56:40 -07:00
James Hillyerd	091e26c467	docker-build should also run on tags (#230 )	2021-08-01 13:19:19 -07:00
James Hillyerd	6593a36b48	Merge tag 'v3.0.0-rc3' into develop Release is for CI/CD changes only.	2021-08-01 13:02:26 -07:00
James Hillyerd	68ef2d9873	Merge branch 'release/3.0.0-rc3'	2021-08-01 13:01:35 -07:00
James Hillyerd	ab988caf6b	Add rc3 to change log	2021-08-01 13:00:28 -07:00
James Hillyerd	fa62220d98	Add ghcr.io to docker metadata images	2021-08-01 12:29:26 -07:00
James Hillyerd	1ecf424975	login to GitHub container registry	2021-08-01 12:14:28 -07:00
James Hillyerd	3342938dd4	Update to docker-push-action v2 w/ metadata, buildx (#228 ) Docker Hub no longer builds for us, so we need to switch to GHA	2021-08-01 11:57:46 -07:00
James Hillyerd	6be1655723	Update to docker-push-action v2 w/ metadata, buildx (#228 ) Docker Hub no longer builds for us, so we need to switch to GHA	2021-08-01 11:52:17 -07:00
James Hillyerd	1465e6fb49	Merge tag 'v3.0.0-rc2' into develop Added: - Support for SMTP AUTH (#197, thanks makarchuk) - Dark mode support (#218, thanks nerones) Fixed: - Prevent potential click jacking (#190, thanks stuartskelton) - Error on 8 character long SMTP commands (#221) - Allow empty username and password during AUTH (#225)	2021-07-31 16:41:35 -07:00