Skip to content

Commit

Permalink
fix Docker
Browse files Browse the repository at this point in the history
  • Loading branch information
Adafede committed Aug 23, 2024
1 parent f74cb0d commit 29d7906
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
platforms: linux/amd64
# platforms: linux/amd64,linux/arm64
# platforms: linux/amd64
platforms: linux/amd64,linux/arm64

- name: Login to Docker Hub
uses: docker/login-action@v3
Expand All @@ -55,8 +55,8 @@ jobs:
cache-from: type=gha
cache-to: type=gha,mode=max
context: .
platforms: linux/amd64
# platforms: linux/amd64,linux/arm64
# platforms: linux/amd64
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ env.LATEST_TAG }}

Expand Down
7 changes: 1 addition & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
FROM bioconductor/bioconductor_docker:3.19-R-4.4.0

# Update apt and install necessary system dependencies
RUN apt-get update && apt-get install -y --no-install-recommends libcurl4-openssl-dev libharfbuzz-dev libfribidi-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Add a non-root user and create the R library directory
RUN useradd -m tima-user && \
mkdir -p /home/tima-user/Library/Frameworks/R.framework/Resources/site-library && \
Expand All @@ -18,7 +13,7 @@ USER tima-user
WORKDIR /home/tima-user

# Install R dependencies
RUN Rscript -e "install.packages('tima', repos = c('https://taxonomicallyinformedannotation.r-universe.dev', 'https://bioc.r-universe.dev', 'https://cloud.r-project.org'))"
RUN Rscript -e "devtools::install_github('taxonomicallyinformedannotation/tima')"

# Additional install
RUN Rscript -e "tima::install()"
Expand Down
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ A container is also available, together with a small compose file.
Main commands are below:

``` bash
docker pull adafede/tima-r --platform linux/amd64
# docker build . -t adafede/tima-r --platform linux/amd64
docker pull adafede/tima-r
# docker build . -t adafede/tima-r
```

``` bash
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@ A container is also available, together with a small compose file. Main
commands are below:

``` bash
docker pull adafede/tima-r --platform linux/amd64
# docker build . -t adafede/tima-r --platform linux/amd64
docker pull adafede/tima-r
# docker build . -t adafede/tima-r
```

``` bash
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@
"SystemRequirements": null
},
"keywords": ["metaboliteannotation", "chemotaxonomy", "scoringsystem", "naturalproducts", "computationalmetabolomics", "taxonomicdistance", "specializedmetabolome"],
"fileSize": "4075.582KB",
"fileSize": "4075.212KB",
"citation": [
{
"@type": "SoftwareSourceCode",
Expand Down

0 comments on commit 29d7906

Please sign in to comment.