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

Switch to apollo git #4

Merged
merged 2 commits into from
Jun 15, 2021
Merged

Switch to apollo git #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c28d4ee
trying git checkout of apollo instead of npm
scottcain Jun 14, 2021
0f2134d
minor clean up. the switch to git should address https://agr-jira.atl…
Jun 15, 2021
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
27 changes: 15 additions & 12 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,22 @@ RUN curl -s "http://hgdownload.soe.ucsc.edu/admin/exe/linux.x86_64/blat/blat" -o
gunzip /chado.sql.gz

#NOTE, we had problems with the build the archive-file coming in from github so using a clone instead
#RUN npm i -g yarn && useradd -ms /bin/bash -d /apollo apollo
RUN npm i -g yarn && useradd -ms /bin/bash -d /apollo apollo
COPY client /apollo/client
COPY gradlew /apollo
COPY grails-app /apollo/grails-app
COPY gwt-sdk /apollo/gwt-sdk
COPY lib /apollo/lib
COPY src /apollo/src
COPY web-app /apollo/web-app
COPY wrapper /apollo/wrapper
COPY test /apollo/test
COPY scripts /apollo/scripts
RUN git clone --depth 1 --single-branch --branch develop https://github.com/gmod/apollo /apollo/apollo-clone
RUN mv /apollo/apollo-clone/* /apollo && rm -rf /apollo/apollo-clone
#COPY client /apollo/client
#COPY gradlew /apollo
#COPY grails-app /apollo/grails-app
#COPY gwt-sdk /apollo/gwt-sdk
#COPY lib /apollo/lib
#COPY src /apollo/src
#COPY web-app /apollo/web-app
#COPY wrapper /apollo/wrapper
#COPY test /apollo/test
#COPY scripts /apollo/scripts
ADD gra* /apollo/
COPY apollo /apollo/apollo
#COPY apollo /apollo/apollo
ADD build* /apollo/
ADD settings.gradle /apollo
ADD application.properties /apollo
Expand Down Expand Up @@ -84,8 +87,8 @@ RUN curl -s get.sdkman.io | bash && \

RUN /bin/bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && /bin/bash /bin/build.sh"


USER root

# remove from webapps and copy it into a staging directory
#RUN rm -rf ${CATALINA_BASE}/webapps/* && \
# cp /apollo/apollo*.war ${CATALINA_BASE}/apollo.war
Expand Down