GitHub/ergo
3
0
Fork 0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-21 19:39:43 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Shivaram Lingamneni 2020-03-07 23:49:59 -05:00
parent 5e5c857821
commit c38922005b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -1,13 +1,18 @@
## build Oragono ## build Oragono
FROM golang:1.14-alpine AS build-env FROM golang:1.14-alpine AS build-env
RUN apk add --no-cache git make curl RUN apk add --no-cache git make curl sed
# copy oragono # copy oragono
RUN mkdir -p /go/src/github.com/oragono/oragono RUN mkdir -p /go/src/github.com/oragono/oragono
WORKDIR /go/src/github.com/oragono/oragono WORKDIR /go/src/github.com/oragono/oragono
ADD . /go/src/github.com/oragono/oragono/ ADD . /go/src/github.com/oragono/oragono/
# modify default config file so that it doesn't die on IPv6
# and so it can be exposed via 6667 by default
run sed -i 's/^\(.*\)\"127.0.0.1:6667\":.*$/\1":6667":/' /go/src/github.com/oragono/oragono/oragono.yaml
run sed -i 's/^.*\"\[::1\]:6667\":.*$//' /go/src/github.com/oragono/oragono/oragono.yaml
# make sure submodules are up-to-date # make sure submodules are up-to-date
RUN git submodule update --init RUN git submodule update --init
@ -37,13 +42,6 @@ COPY --from=build-env /go/bin/oragono /ircd-bin
COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/ COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/
COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml /ircd-bin/oragono.yaml COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml /ircd-bin/oragono.yaml
# modify default config file so that it doesn't die on IPv6
# and so it can be exposed via 6667 by default
RUN apk add --no-cache python3
RUN apk add --no-cache jq
RUN pip3 install yq
RUN yq -iy 'del(.server.listeners."[::1]:6667") | del(.server.listeners."127.0.0.1:6667") | .server.listeners += {":6667": {}}' /ircd-bin/oragono.yaml
COPY distrib/docker/run.sh /ircd-bin/run.sh COPY distrib/docker/run.sh /ircd-bin/run.sh
RUN chmod +x /ircd-bin/run.sh RUN chmod +x /ircd-bin/run.sh