Browse Source

Update dockerfile after build process changes

Fixes #13
pull/14/head
Chris Smith 5 years ago
parent
commit
6fcfd04f52
1 changed files with 2 additions and 11 deletions
  1. 2
    11
      Dockerfile

+ 2
- 11
Dockerfile View File

@@ -3,15 +3,6 @@ FROM golang:rc-alpine AS build-env
3 3
 
4 4
 RUN apk add --no-cache git make curl
5 5
 
6
-# install goreleaser
7
-RUN mkdir -p /go/src/github.com/goreleaser
8
-WORKDIR /go/src/github.com/goreleaser
9
-
10
-RUN git clone https://github.com/goreleaser/goreleaser.git
11
-WORKDIR /go/src/github.com/goreleaser/goreleaser
12
-RUN make setup build
13
-RUN cp ./goreleaser /usr/bin
14
-
15 6
 # get oragono
16 7
 RUN mkdir -p /go/src/github.com/oragono
17 8
 WORKDIR /go/src/github.com/oragono
@@ -20,7 +11,7 @@ RUN git clone --recurse-submodules https://github.com/oragono/oragono.git
20 11
 WORKDIR /go/src/github.com/oragono/oragono
21 12
 
22 13
 # compile
23
-RUN make build
14
+RUN make
24 15
 
25 16
 
26 17
 
@@ -41,7 +32,7 @@ EXPOSE 6667/tcp 6697/tcp
41 32
 
42 33
 # oragono itself
43 34
 RUN mkdir -p /ircd-bin
44
-COPY --from=build-env /go/src/github.com/oragono/oragono/dist/linux_amd64/oragono /ircd-bin
35
+COPY --from=build-env /go/bin/oragono /ircd-bin
45 36
 COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/
46 37
 COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml /ircd-bin/oragono.yaml
47 38
 COPY run.sh /ircd-bin/run.sh

Loading…
Cancel
Save