Skip to content

Commit

Permalink
Merge pull request #14 from AgPipeline/develop
Browse files Browse the repository at this point in the history
Merging testing changes to main branch
  • Loading branch information
Chris-Schnaufer authored Oct 21, 2021
2 parents 63aa66f + 98f42ac commit 4494bc8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ COPY --from=build /app/react_frontend/build/* ./
# Install additional packages
RUN apt-get update && \
apt-get install -y --no-install-recommends git && \
apt-get install -y --no-install-recommends python3-dev && \
apt-get install -y --no-install-recommends gcc g++ && \
apt-get autoremove -y && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand All @@ -57,12 +59,13 @@ RUN apt-get update && \
COPY ./requirements.txt ./
RUN python3 -m pip install --upgrade --no-cache-dir pip
RUN python3 -m pip install --upgrade --no-cache-dir -r requirements.txt
RUN python3 -m pip install --upgrade --no-cache-dir setuptools

# Copy files to where we want them
RUN mkdir templates && mv index.html templates/
COPY ./*.py ./*.sh ./
COPY ./test_data ./test_data

# COPY ./test_data ./test_data
# TODO: Get the pylint resource file
# TODO: install testing environment (plot-base-rgb: 1.9)
# TODO: install test images:https://data.cyverse.org/dav-anon/iplant/projects/aes/cct/diag/sample-data/sample_plot_images.zip and place in separate folders
Expand Down
1 change: 1 addition & 0 deletions src/WorkspaceTitlebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
flex-direction: row;
align-content: space-between;
align-items:stretch;
min-height: 40px;
}

.wt-header-back {
Expand Down

0 comments on commit 4494bc8

Please sign in to comment.