Compare commits

...

3 Commits

Author SHA1 Message Date
Harshavardhana
b06a514ce0 update: Deprecate the usage of update=yes query param. (#2801)
Fixes #2799
2016-10-06 16:32:11 -07:00
Kevin Qiu
5b9dd8b80b Use Set instead of Add in the event that the request already contains the content-length (#2683) 2016-09-28 01:11:13 -07:00
Harshavardhana
55882ce783 docker: Use proper release tags with docker. (#2680)
Fixes #2677
2016-09-13 03:22:41 -07:00
5 changed files with 32 additions and 8 deletions

View File

@@ -5,15 +5,15 @@ ENV ALLOW_CONTAINER_ROOT=1
COPY . /go/src/app
RUN \
apk add --no-cache git && \
apk add --no-cache git bash && \
go-wrapper download && \
go-wrapper install && \
go-wrapper install -ldflags "`./buildscripts/docker-flags.sh`" && \
mkdir -p /export/docker && \
cp /go/src/app/docs/Docker.md /export/docker/ && \
rm -rf /go/pkg /go/src && \
apk del git
apk del git bash
EXPOSE 9000
ENTRYPOINT ["go-wrapper", "run", "server"]
ENTRYPOINT ["minio", "server"]
VOLUME ["/export"]
CMD ["/export"]

24
buildscripts/docker-flags.sh Executable file
View File

@@ -0,0 +1,24 @@
#!/usr/bin/env bash
#
# Minio Cloud Storage, (C) 2016 Minio, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
minio="github.com/minio/minio"
version="2016-09-11T17:42:18Z"
release="RELEASE.2016-09-11T17-42-18Z"
commit="85e2d886bcb005d49f3876d6849a2b5a55e03cd3"
echo "-X ${minio}/cmd.Version=${version} -X ${minio}/cmd.ReleaseTag=${release} -X ${minio}/cmd.CommitID=${commit}"

View File

@@ -354,7 +354,7 @@ func doesSignatureMatch(hashedPayload string, r *http.Request, validateRegion bo
for _, h := range signV4Values.SignedHeaders {
if h == "content-length" {
header = cloneHeader(req.Header)
header.Add("content-length", strconv.FormatInt(r.ContentLength, 10))
header.Set("content-length", strconv.FormatInt(r.ContentLength, 10))
break
}
}

View File

@@ -143,10 +143,10 @@ func getReleaseUpdate(updateURL string, noError bool) updateMessage {
switch runtime.GOOS {
case "windows":
// For windows.
downloadURL = newUpdateURLPrefix + "/minio.exe?update=yes"
downloadURL = newUpdateURLPrefix + "/minio.exe"
default:
// For all other operating systems.
downloadURL = newUpdateURLPrefix + "/minio?update=yes"
downloadURL = newUpdateURLPrefix + "/minio"
}
// Initialize update message.

View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package main
package main // import "github.com/minio/minio"
import minio "github.com/minio/minio/cmd"