Skip to content
Snippets Groups Projects
Verified Commit 9b2805bc authored by Sheogorath's avatar Sheogorath :european_castle:
Browse files

Fix entirely broken config mechanism

This patch fixes various problems of the image. Starting by the config
location, the removal of unneeded source code files and creating the
configuration files in the actual system locations instead of randomly
on the filesystem.

This should make sure that the container image can successfully built
and published again. While I'm still a bit puzzled on why it worked in
first place.
parent 741daad9
Branches
Tags
No related merge requests found
Pipeline #8245 failed
...@@ -7,8 +7,12 @@ RUN true \ ...@@ -7,8 +7,12 @@ RUN true \
&& git clone https://github.com/m13253/dns-over-https.git --depth 1 -b "$VERSION" \ && git clone https://github.com/m13253/dns-over-https.git --depth 1 -b "$VERSION" \
&& cd dns-over-https \ && cd dns-over-https \
&& make \ && make \
&& make install \
&& rm -rf /go/dns-over-https/doh-server \
&& apk del .build-utils \ && apk del .build-utils \
&& adduser -h /go/dns-over-https/doh-server -S doh \ && adduser -h /etc/dns-over-https -S doh \
&& chown -R doh /etc/dns-over-https \
&& chmod -R 0700 /etc/dns-over-https \
&& true && true
COPY ./entrypoint.sh /usr/local/bin/entrypoint COPY ./entrypoint.sh /usr/local/bin/entrypoint
...@@ -23,4 +27,4 @@ HEALTHCHECK CMD curl "http://localhost:8053/dns-query?name=${DOH_HEALTHCHECK_DOM ...@@ -23,4 +27,4 @@ HEALTHCHECK CMD curl "http://localhost:8053/dns-query?name=${DOH_HEALTHCHECK_DOM
EXPOSE 8053 EXPOSE 8053
CMD ["./dns-over-https/doh-server/doh-server"] CMD ["doh-server", "-conf", "/etc/dns-over-https/doh-server.conf"]
...@@ -4,8 +4,7 @@ if [ "$UPSTREAM_NAME" != "" ]; then ...@@ -4,8 +4,7 @@ if [ "$UPSTREAM_NAME" != "" ]; then
UPSTREAM="$(getent hosts "$UPSTREAM_NAME" | awk '{print $1}'):53" UPSTREAM="$(getent hosts "$UPSTREAM_NAME" | awk '{print $1}'):53"
fi fi
#cat > ./dns-over-https/doh-server/doh-server.conf <<EOF cat > /etc/dns-over-https/doh-server.conf <<EOF
cat > ./doh-server.conf <<EOF
# HTTP listen port # HTTP listen port
listen = [ listen = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment