Skip to content
Snippets Groups Projects
Commit 0dfdfc6b authored by Pierre Guilleminot's avatar Pierre Guilleminot
Browse files

Move cozy-stack COPY to end of file for better caching

parent cebc4f57
No related tags found
No related merge requests found
...@@ -62,11 +62,6 @@ RUN curl -fsSL "$CADDY_DOWNLOAD_URL" -o caddy.tar.gz \ ...@@ -62,11 +62,6 @@ RUN curl -fsSL "$CADDY_DOWNLOAD_URL" -o caddy.tar.gz \
&& rm caddy.tar.gz && rm caddy.tar.gz
# cozy-stack
COPY cozy-stack /usr/bin
RUN chmod +x /usr/bin/cozy-stack
COPY cozy-app-dev.sh /usr/bin
RUN chmod +x /usr/bin/cozy-app-dev.sh
ENV COZY_PROXY_HOST cozy.local ENV COZY_PROXY_HOST cozy.local
ENV COZY_PROXY_PORT 8080 ENV COZY_PROXY_PORT 8080
...@@ -77,6 +72,12 @@ ENV COZY_STACK_PATH cozy-stack ...@@ -77,6 +72,12 @@ ENV COZY_STACK_PATH cozy-stack
RUN mkdir -p /data/cozy-app && mkdir -p /data/cozy-storage RUN mkdir -p /data/cozy-app && mkdir -p /data/cozy-storage
# cozy-stack
COPY cozy-app-dev.sh /usr/bin
RUN chmod +x /usr/bin/cozy-app-dev.sh
COPY cozy-stack /usr/bin
RUN chmod +x /usr/bin/cozy-stack
EXPOSE 8080 5984 EXPOSE 8080 5984
CMD couchdb 2>/dev/null 1>/dev/null & \ CMD couchdb 2>/dev/null 1>/dev/null & \
......
...@@ -107,10 +107,12 @@ do_install() { ...@@ -107,10 +107,12 @@ do_install() {
do_prepare_ldflags do_prepare_ldflags
printf "installing cozy-stack in ${GOPATH}... "
go install -ldflags "\ go install -ldflags "\
-X github.com/cozy/cozy-stack/pkg/config.Version=${VERSION_STRING} \ -X github.com/cozy/cozy-stack/pkg/config.Version=${VERSION_STRING} \
-X github.com/cozy/cozy-stack/pkg/config.BuildTime=${BUILD_TIME} \ -X github.com/cozy/cozy-stack/pkg/config.BuildTime=${BUILD_TIME} \
-X github.com/cozy/cozy-stack/pkg/config.BuildMode=${BUILD_MODE}" -X github.com/cozy/cozy-stack/pkg/config.BuildMode=${BUILD_MODE}"
echo "ok"
} }
do_build() { do_build() {
...@@ -125,12 +127,14 @@ do_build() { ...@@ -125,12 +127,14 @@ do_build() {
BINARY="${1}" BINARY="${1}"
fi fi
printf "building cozy-stack in ${BINARY}... "
go build -ldflags "\ go build -ldflags "\
-X github.com/cozy/cozy-stack/pkg/config.Version=${VERSION_STRING} \ -X github.com/cozy/cozy-stack/pkg/config.Version=${VERSION_STRING} \
-X github.com/cozy/cozy-stack/pkg/config.BuildTime=${BUILD_TIME} \ -X github.com/cozy/cozy-stack/pkg/config.BuildTime=${BUILD_TIME} \
-X github.com/cozy/cozy-stack/pkg/config.BuildMode=${BUILD_MODE} -X github.com/cozy/cozy-stack/pkg/config.BuildMode=${BUILD_MODE}
" \ " \
-o "${BINARY}" -o "${BINARY}"
echo "ok"
} }
# The deploy command will build a new release and deploy it on a # The deploy command will build a new release and deploy it on a
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment