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

Upgrade miniforge version in all Dockerfiles #462

Merged
merged 1 commit into from
Sep 8, 2023
Merged

Upgrade miniforge version in all Dockerfiles #462

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion python/batch-predictor/docker/base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ WORKDIR ${HOME}
# Install miniconda
ENV CONDA_DIR ${HOME}/miniconda3
ENV PATH ${CONDA_DIR}/bin:$PATH
ENV MINIFORGE_VERSION=4.14.0-0
ENV MINIFORGE_VERSION=23.3.1-1

RUN wget --quiet https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/Miniforge3-${MINIFORGE_VERSION}-Linux-x86_64.sh -O miniconda.sh && \
/bin/bash miniconda.sh -b -p ${CONDA_DIR} && \
Expand Down
2 changes: 1 addition & 1 deletion python/pyfunc-server/docker/base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM condaforge/miniforge3:4.14.0-0
FROM condaforge/miniforge3:23.3.1-1

ARG PYTHON_VERSION

Expand Down
6 changes: 3 additions & 3 deletions python/sdk/docs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM continuumio/miniconda3
FROM condaforge/miniforge3:23.3.1-1

RUN apt-get -qq update \
&& apt-get -y install vim make wget curl \
&& conda install -c conda-forge pandoc=1.19.2
&& apt-get -y install vim make wget curl \
&& conda install pandoc=1.19.2

COPY . /tmp/merlin-sdk
WORKDIR /tmp/merlin-sdk/docs
Expand Down
2 changes: 1 addition & 1 deletion python/sdk/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pip install -r requirements_docs.txt

Install `pandoc`
```bash
conda install -c conda-forge pandoc=1.19.2
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

-c conda-forge doesn't need to be specified explicitly anymore as it's the default channel.

Copy link
Contributor

Choose a reason for hiding this comment

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

Technically we don't need to change this right? Since this is going to be run by the users themselves and we don't really know or care about which repository they're going to use 🤔

conda install pandoc=1.19.2
```

Generate doc
Expand Down
Loading