From 371dd52fa9ddb1bb4b0efb5757763e1faefe4b83 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 8 Sep 2018 16:10:06 +0200 Subject: [PATCH] updated dockerimage --- Dockerfile | 14 ++++++++------ docker/etc/nsswitch.conf | 15 --------------- docker/etc/s6/.s6-svscan/finish | 2 -- docker/etc/s6/syslogd/finish | 2 -- docker/etc/s6/syslogd/run | 6 ------ docker/etc/s6/syslogd/setup | 1 - docker/etc/s6/vikunja/finish | 2 -- docker/etc/s6/vikunja/run | 6 ------ docker/etc/services.d/.s6-svscan/crash | 2 ++ docker/etc/services.d/.s6-svscan/finish | 2 ++ docker/etc/services.d/vikunja/run | 2 ++ 11 files changed, 14 insertions(+), 40 deletions(-) delete mode 100644 docker/etc/nsswitch.conf delete mode 100755 docker/etc/s6/.s6-svscan/finish delete mode 100755 docker/etc/s6/syslogd/finish delete mode 100755 docker/etc/s6/syslogd/run delete mode 100755 docker/etc/s6/syslogd/setup delete mode 100755 docker/etc/s6/vikunja/finish delete mode 100755 docker/etc/s6/vikunja/run create mode 100755 docker/etc/services.d/.s6-svscan/crash create mode 100755 docker/etc/services.d/.s6-svscan/finish create mode 100755 docker/etc/services.d/vikunja/run diff --git a/Dockerfile b/Dockerfile index 4542cd6e720..3d19830e49a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ ENV TAGS "sqlite" RUN apk --no-cache add build-base git #Setup repo -COPY . ${GOPATH}/src/code.vikunja.io/vikunja -WORKDIR ${GOPATH}/src/code.vikunja.io/vikunja +COPY . ${GOPATH}/src/code.vikunja.io/api +WORKDIR ${GOPATH}/src/code.vikunja.io/api #Checkout version if set RUN if [ -n "${VIKUNJA_VERSION}" ]; then git checkout "${VIKUNJA_VERSION}"; fi \ @@ -33,9 +33,11 @@ RUN apk --no-cache add \ su-exec \ tzdata -ENTRYPOINT ["/usr/bin/entrypoint"] -CMD ["/bin/s6-svscan", "/etc/s6"] + COPY docker / -COPY --from=build-env /go/src/code.vikunja.io/vikunja/vikunja /app/vikunja/vikunja -RUN ln -s /app/vikunja/vikunja /usr/local/bin/vikunja +COPY --from=build-env /go/src/code.vikunja.io/api/vikunja /app/vikunja/api +#RUN ln -s /app/vikunja/vikunja /usr/local/bin/vikunja + +ENTRYPOINT ["/bin/s6-svscan", "/etc/services.d"] +CMD [] diff --git a/docker/etc/nsswitch.conf b/docker/etc/nsswitch.conf deleted file mode 100644 index 25fad995e65..00000000000 --- a/docker/etc/nsswitch.conf +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/nsswitch.conf - -passwd: compat -group: compat -shadow: compat - -hosts: files dns -networks: files - -protocols: db files -services: db files -ethers: db files -rpc: db files - -netgroup: nis diff --git a/docker/etc/s6/.s6-svscan/finish b/docker/etc/s6/.s6-svscan/finish deleted file mode 100755 index 06bd986563d..00000000000 --- a/docker/etc/s6/.s6-svscan/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exit 0 diff --git a/docker/etc/s6/syslogd/finish b/docker/etc/s6/syslogd/finish deleted file mode 100755 index 06bd986563d..00000000000 --- a/docker/etc/s6/syslogd/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exit 0 diff --git a/docker/etc/s6/syslogd/run b/docker/etc/s6/syslogd/run deleted file mode 100755 index 2c8d2cf1f2c..00000000000 --- a/docker/etc/s6/syslogd/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -[[ -f ./setup ]] && source ./setup - -pushd /root > /dev/null - exec su-exec root /sbin/syslogd -nS -O- -popd diff --git a/docker/etc/s6/syslogd/setup b/docker/etc/s6/syslogd/setup deleted file mode 100755 index a9bf588e2f8..00000000000 --- a/docker/etc/s6/syslogd/setup +++ /dev/null @@ -1 +0,0 @@ -#!/bin/bash diff --git a/docker/etc/s6/vikunja/finish b/docker/etc/s6/vikunja/finish deleted file mode 100755 index 06bd986563d..00000000000 --- a/docker/etc/s6/vikunja/finish +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exit 0 diff --git a/docker/etc/s6/vikunja/run b/docker/etc/s6/vikunja/run deleted file mode 100755 index 6af156128c8..00000000000 --- a/docker/etc/s6/vikunja/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -[[ -f ./setup ]] && source ./setup - -pushd /app/vikunja > /dev/null - exec su-exec $USER /app/vikunja/vikunja -popd diff --git a/docker/etc/services.d/.s6-svscan/crash b/docker/etc/services.d/.s6-svscan/crash new file mode 100755 index 00000000000..1dadeeaf86e --- /dev/null +++ b/docker/etc/services.d/.s6-svscan/crash @@ -0,0 +1,2 @@ +#!/bin/sh +/bin/true diff --git a/docker/etc/services.d/.s6-svscan/finish b/docker/etc/services.d/.s6-svscan/finish new file mode 100755 index 00000000000..1dadeeaf86e --- /dev/null +++ b/docker/etc/services.d/.s6-svscan/finish @@ -0,0 +1,2 @@ +#!/bin/sh +/bin/true diff --git a/docker/etc/services.d/vikunja/run b/docker/etc/services.d/vikunja/run new file mode 100755 index 00000000000..dcc3f69f7f4 --- /dev/null +++ b/docker/etc/services.d/vikunja/run @@ -0,0 +1,2 @@ +#!/bin/execlineb -P +/app/vikunja/api