-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #26 from guzman-raphael/upgrade
Upgrade image stack with new features and add placeholder for ARM builds
- Loading branch information
Showing
8 changed files
with
118 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,8 +11,8 @@ RUN \ | |
| umask u+rwx,g+rwx,o-rwx && \ | ||
| # https://gist.github.com/yuriburger/f13208717b1878fe835346b9871d0ead | ||
| echo "graphviz fontconfig msttcorefonts-installer" | \ | ||
| sed 's|\s|\n|g' > /tmp/apk_requirements.txt && \ | ||
| /entrypoint.sh "anaconda" "/home/anaconda" echo done && \ | ||
| sed 's|\s|\n|g' > $APK_REQUIREMENTS && \ | ||
| /entrypoint.sh echo done && \ | ||
| export PY_VER=$(python --version 2>&1 | grep -o "\d.\d") && \ | ||
| if echo "$PY_VER" | grep -o "3\.9\|3\.8"; then \ | ||
| pip install --platform=manylinux1_x86_64 --only-binary=:all: \ | ||
|
|
@@ -21,7 +21,7 @@ RUN \ | |
| fi && \ | ||
| pip install --no-cache-dir datajoint && \ | ||
| pip uninstall datajoint -y && \ | ||
| rm /tmp/apk_requirements.txt | ||
| rm $APK_REQUIREMENTS | ||
|
|
||
| ENV APK_REQUIREMENTS /tmp/apk_requirements.txt | ||
| ENV PIP_REQUIREMENTS /tmp/pip_requirements.txt | ||
|
|
@@ -34,16 +34,15 @@ RUN \ | |
| chmod +x /entrypoint.sh && \ | ||
| chmod 4755 /startup | ||
| USER anaconda:anaconda | ||
| ENTRYPOINT ["/entrypoint.sh", "anaconda", "/home/anaconda"] | ||
| ENTRYPOINT ["/entrypoint.sh"] | ||
| WORKDIR /main | ||
| VOLUME /tmp/.X11-unix | ||
| CMD ["sh"] | ||
|
|
||
|
|
||
| # #Squashed Final Image | ||
| # Squashed Final Image | ||
| FROM scratch | ||
| COPY --from=py_build / / | ||
| # RUN chmod 4755 /startup && /startup -user=anaconda | ||
| LABEL maintainerName="Raphael Guzman" \ | ||
| maintainerEmail="[email protected]" \ | ||
| maintainerCompany="DataJoint" | ||
|
|
@@ -55,7 +54,7 @@ ENV LANG C.UTF-8 | |
| ENV APK_REQUIREMENTS /tmp/apk_requirements.txt | ||
| ENV PIP_REQUIREMENTS /tmp/pip_requirements.txt | ||
| ENV CONDA_REQUIREMENTS /tmp/conda_requirements.txt | ||
| ENTRYPOINT ["/entrypoint.sh", "anaconda", "/home/anaconda"] | ||
| ENTRYPOINT ["/entrypoint.sh"] | ||
| WORKDIR /main | ||
| VOLUME /tmp/.X11-unix | ||
| CMD ["sh"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| version: '2.4' | ||
| version: '3.7' | ||
| services: | ||
| app: | ||
| build: # Uncomment to enable local build | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,8 +9,8 @@ LABEL maintainerName="Raphael Guzman" \ | |
|
|
||
| RUN \ | ||
| umask u+rwx,g+rwx,o-rwx && \ | ||
| echo 'graphviz' > /tmp/apt_requirements.txt && \ | ||
| /entrypoint.sh "anaconda" "/home/anaconda" echo done && \ | ||
| echo 'graphviz' > $APT_REQUIREMENTS && \ | ||
| /entrypoint.sh echo done && \ | ||
| export PY_VER=$(python --version 2>&1 | grep -o "\d.\d") && \ | ||
| if echo "$PY_VER" | grep -oP "3\.9\|3\.8"; then \ | ||
| pip install --platform=manylinux1_x86_64 --only-binary=:all: \ | ||
|
|
@@ -22,7 +22,7 @@ RUN \ | |
| # decorator package had a conflict so installing again to force resolve | ||
| pip install datajoint --no-cache-dir && \ | ||
| pip uninstall datajoint -y && \ | ||
| rm /tmp/apt_requirements.txt | ||
| rm $APT_REQUIREMENTS | ||
|
|
||
| ENV APT_REQUIREMENTS /tmp/apt_requirements.txt | ||
| ENV PIP_REQUIREMENTS /tmp/pip_requirements.txt | ||
|
|
@@ -32,28 +32,26 @@ RUN \ | |
| chmod +x /entrypoint.sh && \ | ||
| chmod 4755 /startup | ||
| USER anaconda:anaconda | ||
| ENTRYPOINT ["/entrypoint.sh", "anaconda", "/home/anaconda"] | ||
| ENTRYPOINT ["/entrypoint.sh"] | ||
| WORKDIR /main | ||
| VOLUME /tmp/.X11-unix | ||
| CMD ["bash"] | ||
|
|
||
|
|
||
| # #Squashed Final Image | ||
| # Squashed Final Image | ||
| FROM scratch | ||
| COPY --from=py_build / / | ||
| # RUN chmod 4755 /startup && /startup -user=anaconda | ||
| LABEL maintainerName="Raphael Guzman" \ | ||
| maintainerEmail="[email protected]" \ | ||
| maintainerCompany="DataJoint" | ||
| USER anaconda:anaconda | ||
| ENV PATH /opt/conda/bin:$PATH | ||
| RUN conda clean -ya | ||
| ENV HOME /home/anaconda | ||
| ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 | ||
| ENV APT_REQUIREMENTS /tmp/apt_requirements.txt | ||
| ENV PIP_REQUIREMENTS /tmp/pip_requirements.txt | ||
| ENV CONDA_REQUIREMENTS /tmp/conda_requirements.txt | ||
| ENTRYPOINT ["/entrypoint.sh", "anaconda", "/home/anaconda"] | ||
| ENTRYPOINT ["/entrypoint.sh"] | ||
| WORKDIR /main | ||
| VOLUME /tmp/.X11-unix | ||
| CMD ["bash"] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| version: '2.4' | ||
| version: '3.7' | ||
| services: | ||
| app: | ||
| build: # Uncomment to enable local build | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.