Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pkg/files: Add new vuetify poc UI #94

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

pkg/files: Add new vuetify poc UI #94

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/files/docker/storj.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ WORKDIR /var/lib/storj/storj
COPY --chown=storj ${PATH} .

FROM ${TYPE} AS binaries
RUN if [ -z "$SKIP_FRONTEND_BUILD" ] ; then cd web/satellite && npm install && npm run build ; fi
RUN if [ -z "$SKIP_FRONTEND_BUILD" ] ; then cd web/satellite && npm install && npm run build && npm run build-vuetify ; fi
RUN if [ -z "$SKIP_FRONTEND_BUILD" ] ; then cd web/multinode && npm install && npm install @vue/cli-service && export PATH=$PATH:`pwd`/node_modules/.bin && npm run build ; fi
RUN if [ -z "$SKIP_FRONTEND_BUILD" ] ; then cd web/storagenode && npm install && npm install @vue/cli-service && export PATH=$PATH:`pwd`/node_modules/.bin && npm run build ; fi
RUN if [ -z "$SKIP_FRONTEND_BUILD" ] ; then cd satellite/admin/ui && npm install && npm run build ; fi
Expand All @@ -50,6 +50,7 @@ ENV STORJ_STORAGENODE_CONSOLE_STATIC_DIR=/var/lib/storj/web/storagenode
COPY --from=binaries /var/lib/storj/go/bin /var/lib/storj/go/bin
COPY --from=binaries /var/lib/storj/storj/web/satellite/stati[c] /var/lib/storj/storj/web/satellite/static
COPY --from=binaries /var/lib/storj/storj/web/satellite/dis[t] /var/lib/storj/storj/web/satellite/dist
COPY --from=binaries /var/lib/storj/storj/web/satellite/dist_vuetify_poc /var/lib/storj/storj/web/satellite/dist_vuetify_poc
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The brackets are needed here because if you pass in the build arg SKIP_FRONTEND_BUILD=true (which is useful to speed up the build in cases where you just want to test with the satellite and uplink, and don't need the front end build) you will get an error "/var/lib/storj/storj/web/satellite/dist_vuetify_poc": not found. If you add a bracket around the last character to make this line COPY --from=binaries /var/lib/storj/storj/web/satellite/dist_vuetify_po[c] /var/lib/storj/storj/web/satellite/dist_vuetify_poc this tells docker "I only want to copy this folder if it exists. If it doesn't exist, it's not an error, just continue."

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't we have the same issue with some lines further down? The admin UI is missing the brackets.

COPY --from=binaries /var/lib/storj/storj/satellite/admin/ui/build /var/lib/storj/storj/satellite/admin/ui/build
COPY --from=binaries /var/lib/storj/storj/web/storagenode/stati[c] /var/lib/storj/web/storagenode/static
COPY --from=binaries /var/lib/storj/storj/web/storagenode/dis[t] /var/lib/storj/web/storagenode/dist
Expand Down
Loading