diff --git a/dockerfile b/dockerfile index b457dac..6b78613 100644 --- a/dockerfile +++ b/dockerfile @@ -7,13 +7,12 @@ FROM golang:alpine AS builder RUN apk update && apk add --no-cache 'git=~2' # Install dependencies -ENV GO111MODULE=on -WORKDIR $GOPATH/src/packages/goginapp/ -COPY . . +COPY go.mod go.sum ./ +RUN go mod download # Fetch dependencies. # Using go get. -RUN go get -d -v +COPY . . # Build the binary. RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/main . @@ -21,7 +20,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o /go/main . ############################ # STEP 2 build a small image ############################ -FROM alpine:3 +FROM alpine:latest WORKDIR / diff --git a/image.png b/image.png deleted file mode 100644 index f15b5c3..0000000 Binary files a/image.png and /dev/null differ diff --git a/views/partials/popover-conversation.html b/views/partials/popover-conversation.html index f39dbc6..8252d25 100644 --- a/views/partials/popover-conversation.html +++ b/views/partials/popover-conversation.html @@ -148,6 +148,7 @@ document.getElementById('cancel-conversation-button').classList.remove('is-hidden'); document.getElementById('delete-conversation-button').classList.add('is-hidden'); document.getElementById('conversation-list').classList.add('is-hidden'); + document.getElementById('archive-default-conversation-button').classList.add('is-hidden'); }) document.getElementById('cancel-conversation-button').addEventListener('click', function () {