updated dockerimage
All checks were successful
the build was successful

This commit is contained in:
kolaente 2018-09-08 16:10:06 +02:00
parent f0b0319f54
commit 371dd52fa9
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
11 changed files with 14 additions and 40 deletions

@ -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 []

@ -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

@ -1,2 +0,0 @@
#!/bin/bash
exit 0

@ -1,2 +0,0 @@
#!/bin/bash
exit 0

@ -1,6 +0,0 @@
#!/bin/bash
[[ -f ./setup ]] && source ./setup
pushd /root > /dev/null
exec su-exec root /sbin/syslogd -nS -O-
popd

@ -1 +0,0 @@
#!/bin/bash

@ -1,2 +0,0 @@
#!/bin/bash
exit 0

@ -1,6 +0,0 @@
#!/bin/bash
[[ -f ./setup ]] && source ./setup
pushd /app/vikunja > /dev/null
exec su-exec $USER /app/vikunja/vikunja
popd

@ -0,0 +1,2 @@
#!/bin/sh
/bin/true

@ -0,0 +1,2 @@
#!/bin/sh
/bin/true

@ -0,0 +1,2 @@
#!/bin/execlineb -P
/app/vikunja/api