diff --git a/scripts/Dockerfile b/scripts/Dockerfile index c1cd25b69ab036feeddffaa8dc675b4943bd4a95..a098a8963e9ab394b349042cf134b6d652e86b63 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -62,11 +62,6 @@ RUN curl -fsSL "$CADDY_DOWNLOAD_URL" -o 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_PORT 8080 @@ -77,6 +72,12 @@ ENV COZY_STACK_PATH cozy-stack 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 CMD couchdb 2>/dev/null 1>/dev/null & \ diff --git a/scripts/build.sh b/scripts/build.sh index 73574b5032b65051f61b142ef5e9426a9981b3ad..62e4a14df43715a342077a2c35dfc3d3abbdadb0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -107,10 +107,12 @@ do_install() { do_prepare_ldflags + printf "installing cozy-stack in ${GOPATH}... " go install -ldflags "\ -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.BuildMode=${BUILD_MODE}" + echo "ok" } do_build() { @@ -125,12 +127,14 @@ do_build() { BINARY="${1}" fi + printf "building cozy-stack in ${BINARY}... " go build -ldflags "\ -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.BuildMode=${BUILD_MODE} " \ -o "${BINARY}" + echo "ok" } # The deploy command will build a new release and deploy it on a