Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Team Hephy #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM golang:1.6-alpine
FROM golang:1.11-alpine

MAINTAINER Lachlan Evenson <lachlan.evenson@gmail.com>
MAINTAINER Kingdon Barrett <kingdon@teamhephy.com>

RUN apk --update add ca-certificates

Expand All @@ -9,14 +9,14 @@ ARG BUILD_DATE

# Metadata
LABEL org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url="https://github.com/lachie83/s3-uploader" \
org.label-schema.vcs-url="https://github.com/teamhephy/s3-uploader" \
org.label-schema.build-date=$BUILD_DATE \
org.label-schema.docker.dockerfile="/Dockerfile"

COPY . /go/src/github.com/lachie83/s3-uploader
COPY . /go/src/github.com/teamhephy/s3-uploader
ADD test.jpg /upload/test.jpg

ENV GOPATH /go
RUN cd $GOPATH/src/github.com/lachie83/s3-uploader && go install -v .
RUN cd $GOPATH/src/github.com/teamhephy/s3-uploader && go install -v .

CMD ["s3-uploader"]
CMD ["s3-uploader"]
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
default: docker_build

DOCKER_IMAGE ?= quay.io/deis/s3-uploader
DOCKER_IMAGE ?= quay.io/teamhephy/s3-uploader
BUILD_NUMBER ?= `git rev-parse --short HEAD`
VCS_REF ?= `git rev-parse --short HEAD`

Expand Down Expand Up @@ -33,7 +33,7 @@ all: build

.PHONY: build
build:
GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' github.com/lachie83/s3-uploader/...
GOBIN=$(BINDIR) $(GO) install $(GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' github.com/teamhephy/s3-uploader/...

HAS_GLIDE := $(shell command -v glide;)
HAS_GIT := $(shell command -v git;)
Expand Down
4 changes: 2 additions & 2 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package: github.com/deis/s3-uploader
package: github.com/teamhephy/s3-uploader
import:
- package: github.com/minio/minio-go
version: ~2.0.4
version: ~6.0.9