Dockerfile copies were not right

This commit is contained in:
kexkey
2018-12-17 20:13:14 -05:00
parent 28763aa610
commit f6a7b6c28a
4 changed files with 7 additions and 7 deletions

View File

@@ -10,12 +10,12 @@ RUN apk add --update --no-cache \
jq \
su-exec
COPY auth.sh /etc/nginx/conf.d
COPY auth.sh /etc/nginx/conf.d/
COPY default-ssl.conf /etc/nginx/conf.d/default.conf
COPY statuspage.html /etc/nginx/conf.d/status
COPY statuspage.html /etc/nginx/conf.d/status/
COPY entrypoint.sh entrypoint.sh
COPY trace.sh /etc/nginx/conf.d
COPY tests.sh /etc/nginx/conf.d
COPY trace.sh /etc/nginx/conf.d/
COPY tests.sh /etc/nginx/conf.d/
RUN chmod +x /etc/nginx/conf.d/auth.sh entrypoint.sh

2
dist/setup.sh vendored
View File

@@ -539,7 +539,7 @@ sanity_checks() {
exit
fi
if ! [ -x "$(command -v docker-compose)" ]; then
if [[ $DOCKER_MODE == 'compose' && ! -x "$(command -v docker-compose)" ]]; then
echo " docker-compose is not installed on your system. Please check https://docs.docker.com/compose/install/."
exit
fi

View File

@@ -28,7 +28,7 @@ WORKDIR ${HOME}
COPY app/data/* ./
COPY app/script/* ./
COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli .
COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli ./
RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh \
&& chmod o+w . \

View File

@@ -24,7 +24,7 @@ WORKDIR ${HOME}
COPY app/data/* ./
COPY app/script/* ./
COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli .
COPY --from=cyphernode/clightning:v0.6.2 /usr/bin/lightning-cli ./
RUN chmod +x startproxy.sh requesthandler.sh lightning-cli sqlmigrate*.sh \
&& chmod o+w . \