JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up the satellite image (#1768)

Browse Source 
This is working on saturn and jupiter, plus travis is ok with it.
This commit is contained in:
Matt Robinson 2019-04-16 17:06:59 -04:00 committed by GitHub
parent 9dc4e82437
commit ca2055abaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -132,9 +132,6 @@ satellite-image: satellite_linux_arm satellite_linux_amd64 ## Build satellite Do
${DOCKER_BUILD} --pull=true -t storjlabs/satellite:${TAG}${CUSTOMTAG}-arm32v6 \ ${DOCKER_BUILD} --pull=true -t storjlabs/satellite:${TAG}${CUSTOMTAG}-arm32v6 \
--build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \ --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \
-f cmd/satellite/Dockerfile . -f cmd/satellite/Dockerfile .
.PHONY: satellite-ui-image
satellite-ui-image: ## Build satellite-ui Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/satellite-ui:${TAG}${CUSTOMTAG} -f web/satellite/Dockerfile .
.PHONY: storagenode-image .PHONY: storagenode-image
storagenode-image: storagenode_linux_arm storagenode_linux_amd64 ## Build storagenode Docker image storagenode-image: storagenode_linux_arm storagenode_linux_amd64 ## Build storagenode Docker image
${DOCKER_BUILD} --pull=true -t storjlabs/storagenode:${TAG}${CUSTOMTAG}-amd64 \ ${DOCKER_BUILD} --pull=true -t storjlabs/storagenode:${TAG}${CUSTOMTAG}-amd64 \

22
cmd/satellite/Dockerfile
View File

@ -1,9 +1,3 @@
ARG CGO_ENABLED=1
ARG REPOSITORY=../storj.io/storj
ARG PACKAGE=storj.io/storj/cmd/satellite
FROM storjlabs/golang as build-env
#FROM storjlabs/satellite-ui:5f00274a-philip-satelliteUIDocker-go1.11 as satellite-ui
# Satellite UI static asset generation # Satellite UI static asset generation
FROM node:10.15.1 as satellite-ui FROM node:10.15.1 as satellite-ui
WORKDIR /app WORKDIR /app
@ -15,19 +9,21 @@ RUN npm run build
FROM alpine as ca-cert FROM alpine as ca-cert
RUN apk -U add ca-certificates RUN apk -U add ca-certificates
# final stage ARG DOCKER_ARCH
FROM alpine FROM ${DOCKER_ARCH:-amd64}/alpine
ARG TAG
ARG GOARCH
ENV GOARCH ${GOARCH}
ENV API_KEY= \ ENV API_KEY= \
CONF_PATH=/root/.local/share/storj/satellite \ CONF_PATH=/root/.local/share/storj/satellite \
BOOTSTRAP_ADDR=bootstrap.storj.io:8080 \
STORJ_CONSOLE_STATIC_DIR=/app \ STORJ_CONSOLE_STATIC_DIR=/app \
STORJ_CONSOLE_ADDRESS=0.0.0.0:10100 STORJ_CONSOLE_ADDRESS=0.0.0.0:10100
EXPOSE 7777 EXPOSE 7777
EXPOSE 10100 EXPOSE 10100
WORKDIR /app WORKDIR /app
VOLUME /root/.local/share/storj/satellite COPY --from=satellite-ui /app/static /app/static
COPY --from=satellite-ui /app/dist /app/dist
COPY --from=ca-cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt COPY --from=ca-cert /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=satellite-ui /app/ /app COPY release/${TAG}/satellite_linux_${GOARCH:-amd64} /app/satellite
COPY --from=build-env /app /app/satellite COPY cmd/satellite/entrypoint /entrypoint
COPY /cmd/satellite/entrypoint /entrypoint
ENTRYPOINT ["/entrypoint"] ENTRYPOINT ["/entrypoint"]