Skip to content

Commit

Permalink
Update README to use "COMO" (#96)
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshLoecker authored Mar 2, 2023
1 parent 35d2d29 commit 254be0b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/dockerhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,6 @@ jobs:
with:
ref: ${{ github.GITHUB_REF }}

# Log into the GitHub Container Registry so we can push the image
- name: Log in to Container Registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

# Get tag/release information for docker tags
- name: Docker Metadata
id: metadata
Expand Down Expand Up @@ -68,6 +60,14 @@ jobs:
- name: Assert no outputs present in jupyter notebook
uses: ResearchSoftwareActions/EnsureCleanNotebooksAction@1.1

# Log into the GitHub Container Registry so we can push the image
- name: Log in to Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN conda config --quiet --add channels conda-forge \
&& conda config --quiet --add channels bioconda \
&& conda config --quiet --add channels r \
# Remove python from pinned versions; this allows us to update python. From: https://stackoverflow.com/a/11245372 \
&& sed -i "s/^python*/${PYTHON_VERSION}/" /opt/conda/conda-meta/pinned \
&& sed -i "/^python 3/s/.*/python ${PYTHON_VERSION}" /opt/conda/conda-meta/pinned \
# && mamba install --quiet --yes python=${PYTHON_VERSION} \
&& mamba env update --quiet --name=base --file="${HOME}/environment.yaml" \
&& mamba clean --quiet --all --force-pkgs-dirs --yes \
Expand Down

0 comments on commit 254be0b

Please sign in to comment.