Skip to content

Commit

Permalink
Merge pull request #28 from ossn/fix-master
Browse files Browse the repository at this point in the history
Revert "Merge branch 'pr/21' 'pr/22' 'pr/26' 'pr/27'"
  • Loading branch information
bacharakis authored Jan 22, 2020
2 parents 0cc7ea4 + f3f1a4e commit b387a7a
Show file tree
Hide file tree
Showing 38 changed files with 1,063 additions and 2,101 deletions.
8 changes: 0 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ RUN mkdir -p /go/src/github.com/ossn/fixme_backend
WORKDIR /go/src/github.com/ossn/fixme_backend
RUN mkdir ~/.ssh && ssh-keyscan -t rsa github.com >~/.ssh/known_hosts

# Install dep
RUN curl -fsSL -o /usr/local/bin/dep $(curl -s https://api.github.com/repos/golang/dep/releases/latest | jq -r ".assets[] | select(.name | test(\"dep-linux-amd64\")) |.browser_download_url") && chmod +x /usr/local/bin/dep

# Build app
COPY Gopkg.toml Gopkg.lock ./
RUN go get -u github.com/golang/dep/cmd/dep
RUN dep ensure -vendor-only

COPY . .
RUN GO111MODULE=on buffalo build --environment=production --static -o /bin/app

Expand Down
3 changes: 0 additions & 3 deletions Dockerfile-dev
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ WORKDIR /go/src/github.com/ossn/fixme_backend
RUN mkdir ~/.ssh && ssh-keyscan -t rsa github.com >~/.ssh/known_hosts

# Build app
COPY Gopkg.toml Gopkg.lock ./
RUN go get -u github.com/golang/dep/cmd/dep
RUN dep ensure -vendor-only
ENV ADDR=0.0.0.0
ENV GO111MODULE=on
COPY . .
Expand Down
Loading

0 comments on commit b387a7a

Please sign in to comment.