From 5e5c85782165a639fccaa9dfc4241549df569272 Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Sat, 7 Mar 2020 19:02:33 +1000 Subject: [PATCH 1/3] Fix Docker --- distrib/docker/Dockerfile => Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) rename distrib/docker/Dockerfile => Dockerfile (79%) diff --git a/distrib/docker/Dockerfile b/Dockerfile similarity index 79% rename from distrib/docker/Dockerfile rename to Dockerfile index 30d5da16..0b0cfb17 100644 --- a/distrib/docker/Dockerfile +++ b/Dockerfile @@ -36,6 +36,14 @@ RUN mkdir -p /ircd-bin 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/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 RUN chmod +x /ircd-bin/run.sh From c38922005bb8fbe66c2c6714b73a347861409088 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sat, 7 Mar 2020 23:49:59 -0500 Subject: [PATCH 2/3] use sed instead of yq, in build step instead of run step --- Dockerfile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0b0cfb17..272b5a52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,18 @@ ## build Oragono 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 RUN mkdir -p /go/src/github.com/oragono/oragono WORKDIR /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 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/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 RUN chmod +x /ircd-bin/run.sh From c58e12fb5897c661668616d628b1a9293e164c40 Mon Sep 17 00:00:00 2001 From: Shivaram Lingamneni Date: Sat, 7 Mar 2020 23:55:45 -0500 Subject: [PATCH 3/3] use \s instead of . for matching listener definition lines --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 272b5a52..436a0cbb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ 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 +run sed -i 's/^\(\s*\)\"127.0.0.1:6667\":.*$/\1":6667":/' /go/src/github.com/oragono/oragono/oragono.yaml +run sed -i 's/^\s*\"\[::1\]:6667\":.*$//' /go/src/github.com/oragono/oragono/oragono.yaml # make sure submodules are up-to-date RUN git submodule update --init