Browse Source

use sed instead of yq, in build step instead of run step

tags/v2.0.0
Shivaram Lingamneni 4 years ago
parent
commit
c38922005b
1 changed files with 6 additions and 8 deletions
  1. 6
    8
      Dockerfile

+ 6
- 8
Dockerfile View File

1
 ## build Oragono
1
 ## build Oragono
2
 FROM golang:1.14-alpine AS build-env
2
 FROM golang:1.14-alpine AS build-env
3
 
3
 
4
-RUN apk add --no-cache git make curl
4
+RUN apk add --no-cache git make curl sed
5
 
5
 
6
 # copy oragono
6
 # copy oragono
7
 RUN mkdir -p /go/src/github.com/oragono/oragono
7
 RUN mkdir -p /go/src/github.com/oragono/oragono
8
 WORKDIR /go/src/github.com/oragono/oragono
8
 WORKDIR /go/src/github.com/oragono/oragono
9
 ADD . /go/src/github.com/oragono/oragono/
9
 ADD . /go/src/github.com/oragono/oragono/
10
 
10
 
11
+# modify default config file so that it doesn't die on IPv6
12
+# and so it can be exposed via 6667 by default
13
+run sed -i 's/^\(.*\)\"127.0.0.1:6667\":.*$/\1":6667":/' /go/src/github.com/oragono/oragono/oragono.yaml
14
+run sed -i 's/^.*\"\[::1\]:6667\":.*$//' /go/src/github.com/oragono/oragono/oragono.yaml
15
+
11
 # make sure submodules are up-to-date
16
 # make sure submodules are up-to-date
12
 RUN git submodule update --init
17
 RUN git submodule update --init
13
 
18
 
37
 COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/
42
 COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/
38
 COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml /ircd-bin/oragono.yaml
43
 COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml /ircd-bin/oragono.yaml
39
 
44
 
40
-# modify default config file so that it doesn't die on IPv6
41
-#  and so it can be exposed via 6667 by default
42
-RUN apk add --no-cache python3
43
-RUN apk add --no-cache jq
44
-RUN pip3 install yq
45
-RUN yq -iy 'del(.server.listeners."[::1]:6667") | del(.server.listeners."127.0.0.1:6667") | .server.listeners += {":6667": {}}' /ircd-bin/oragono.yaml
46
-
47
 COPY distrib/docker/run.sh /ircd-bin/run.sh
45
 COPY distrib/docker/run.sh /ircd-bin/run.sh
48
 RUN chmod +x /ircd-bin/run.sh
46
 RUN chmod +x /ircd-bin/run.sh
49
 
47
 

Loading…
Cancel
Save