This commit is contained in:
parent
f0b0319f54
commit
371dd52fa9
14
Dockerfile
14
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 []
|
||||
|
@ -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
|
2
docker/etc/services.d/.s6-svscan/crash
Executable file
2
docker/etc/services.d/.s6-svscan/crash
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
/bin/true
|
2
docker/etc/services.d/.s6-svscan/finish
Executable file
2
docker/etc/services.d/.s6-svscan/finish
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
/bin/true
|
2
docker/etc/services.d/vikunja/run
Executable file
2
docker/etc/services.d/vikunja/run
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/execlineb -P
|
||||
/app/vikunja/api
|
Loading…
Reference in New Issue
Block a user