Merge pull request #239 from sigven/revert-238-patch1

Revert "Restructure installation doc"
sigven · Jun 18, 2024 · 6749e49 · 6749e49
2 parents d3979a7 + 98e251c
commit 6749e49
Show file tree

Hide file tree

Showing 4 changed files with 199 additions and 152 deletions.
diff --git a/.github/workflows/apptainer.yaml b/.github/workflows/apptainer.yaml
@@ -3,10 +3,10 @@ name: apptainer
 on:
   push:
     branches:
-      - patch1
+      - apptainer
 
 env:
-  VERSION: '1.4.1.9015' # versioned by bump2version
+  VERSION: '1.4.1.9006' # versioned by bump2version
 jobs:
   docker2apptainer:
     name: Docker2apptainer
@@ -35,31 +35,31 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: 🐳 Docker img build and push to DockerHub
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v5
         with:
           context: . # yes, dot
           push: false
+          load: true
           platforms: linux/amd64
           tags: |
             sigven/pcgr:${{ env.VERSION }}
-          outputs: type=docker,dest=pcgr_${{ env.VERSION }}.tar
 
       - name: Apptainer setup
         uses: eWaterCycle/setup-apptainer@v2
 
       - name: Apptainer build
         run: |
           docker image ls -a
-          #docker save sigven/pcgr:${VERSION} -o pcgr_${VERSION}.tar
+          docker save sigven/pcgr:${VERSION} -o pcgr_${VERSION}.tar
           ls -la
           df -h
           echo "Building Apptainer SIF"
           echo "---------------------------------"
-          apptainer build pcgr_singularity_${VERSION}.sif docker-archive://pcgr_${VERSION}.tar
+          apptainer build pcgr_${VERSION}.sif docker-archive://pcgr_${VERSION}.tar
           echo "---------------------------------"
           ls -la
           df -h
-     #- name: Upload SIF to GHCR
-     #  run: |
-     #    echo ${{ secrets.GITHUB_TOKEN }} | apptainer registry login -u ${{ github.actor }} --password-stdin oras://ghcr.io
-     #    apptainer push pcgr_${VERSION}.sif oras://ghcr.io/${GITHUB_REPOSITORY}:${VERSION}
+      - name: Upload SIF to GHCR
+        run: |
+          echo ${{ secrets.GITHUB_TOKEN }} | apptainer registry login -u ${{ github.actor }} --password-stdin oras://ghcr.io
+          apptainer push pcgr_${VERSION}.sif oras://ghcr.io/${GITHUB_REPOSITORY}:${VERSION}
diff --git a/Dockerfile b/Dockerfile
@@ -1,19 +1,16 @@
 FROM ubuntu:20.04
-LABEL org.opencontainers.image.authors='[email protected], [email protected]' \
-      org.opencontainers.image.description='Personal Cancer Genome Reporter (PCGR)' \
-      org.opencontainers.image.source='https://github.com/sigven/pcgr' \
-      org.opencontainers.image.url='https://github.com/sigven/pcgr' \
-      org.opencontainers.image.documentation='https://sigven.github.io/pcgr' \
-      org.opencontainers.image.licenses='MIT'
+LABEL maintainer="https://github.com/pdiakumis"
 
 ARG MINI_VERSION=4.11.0-0
 ARG MINI_URL=https://github.com/conda-forge/miniforge/releases/download/${MINI_VERSION}/Mambaforge-${MINI_VERSION}-Linux-x86_64.sh
 
 # install core pkgs, mambaforge
 RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
-    bash bzip2 curl less wget zip ca-certificates && \
+    bash bzip2 curl git less vim wget zip ca-certificates && \
     apt-get clean && \
+    rm -r /var/lib/apt/lists/* && \
+    rm -r /var/cache/apt/* && \
     curl --silent -L "${MINI_URL}" -o "mambaforge.sh" && \
     /bin/bash mambaforge.sh -b -p /opt/mambaforge/ && \
     rm mambaforge.sh

diff --git a/conda/env/yml/pkgdown.yml b/conda/env/yml/pkgdown.yml
@@ -7,5 +7,4 @@ dependencies:
   - pcgr::r-pcgrr ==1.4.1.9015 # versioned by bump2version
   - r-pkgdown
   - r-readr
-  - r-glue
   - pandoc
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,5 +7,4 @@ dependencies: @@
       - pcgr::r-pcgrr ==1.4.1.9015 # versioned by bump2version
       - r-pkgdown
       - r-readr
-      - r-glue
       - pandoc